From da612acedb63366cbc9a94113997d9af08925f42 Mon Sep 17 00:00:00 2001
From: helming <strive_code@163.com>
Date: Sun, 19 Mar 2023 20:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/money-view/money-view.vue          |   6 +-
 package-lock.json                             | 105 ---------
 .../creatorAccount/createAccount.vue          | 208 ++++++++++--------
 .../creatorAccount/creatorAccount.vue         |   5 +-
 pages/index/upload/upload.vue                 |  38 +++-
 pages/register/register.vue                   |   4 +-
 6 files changed, 154 insertions(+), 212 deletions(-)
 delete mode 100644 package-lock.json

diff --git a/components/money-view/money-view.vue b/components/money-view/money-view.vue
index 0fa5bf1..d34fcb4 100644
--- a/components/money-view/money-view.vue
+++ b/components/money-view/money-view.vue
@@ -44,14 +44,14 @@ export default {
     }
   },
   created() {
-    this.moneyValue = this.moneyFormat(this.value, 2, ',')
+    this.moneyValue = this.moneyFormat(this.value, 3, ',')
   },
   methods: {
     thousandFormat(num, split) {
       const len = num.length
       return len <= 3 ? num : this.thousandFormat(num.substr(0, len - 3)) + split + num.substr(len - 3, 3)
     },
-    moneyFormat(num, decimal = 2, split = ',') {
+    moneyFormat(num, decimal = 3, split = ',') {
       /*
         parameter：
         num：格式化目标数字
@@ -86,7 +86,7 @@ export default {
   },
   watch: {
     value(newValue) {
-      this.moneyValue = this.moneyFormat(newValue, 2, ',')
+      this.moneyValue = this.moneyFormat(newValue, 3, ',')
     },
 
   }
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index b4fdc0b..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@vue/devtools-api": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.0.tgz",
-      "integrity": "sha512-pF1G4wky+hkifDiZSWn8xfuLOJI1ZXtuambpBEYaf7Xaf6zC/pM29rvAGpd3qaGXnr4BAXU1Pxz/VfvBGwexGA=="
-    },
-    "axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-      "requires": {
-        "follow-redirects": "^1.14.8"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "js-md5": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
-      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
-    },
-    "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-    },
-    "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "vue-router": {
-      "version": "4.0.16",
-      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.0.16.tgz",
-      "integrity": "sha512-JcO7cb8QJLBWE+DfxGUL3xUDOae/8nhM1KVdnudadTAORbuxIC/xAydC5Zr/VLHUDQi1ppuTF5/rjBGzgzrJNA==",
-      "requires": {
-        "@vue/devtools-api": "^6.0.0"
-      }
-    },
-    "vuex": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz",
-      "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==",
-      "requires": {
-        "@vue/devtools-api": "^6.0.0-beta.11"
-      }
-    }
-  }
-}
diff --git a/pages-userInfo/creatorAccount/createAccount.vue b/pages-userInfo/creatorAccount/createAccount.vue
index 83b9e94..3dc8120 100644
--- a/pages-userInfo/creatorAccount/createAccount.vue
+++ b/pages-userInfo/creatorAccount/createAccount.vue
@@ -29,17 +29,12 @@
                                :selectedTextColor="'#FFFFFF'">
             </uni-data-checkbox>
           </uni-forms-item>
-					<uni-forms-item v-if="type === 2" label="支付宝账号" required name="accountNo">
-						<uni-easyinput v-model="accountInfo.accountNo" placeholder="请输入支付宝账号"
+					<uni-forms-item :label="(type === 0 ? '微信' : type === 2 ? '支付宝' : '') + '账号'" required name="accountNo">
+						<uni-easyinput v-model="accountInfo.accountNo" placeholder="请输入收款账号"
                            :clearable="false"
                            :inputBorder="false" />
 					</uni-forms-item>
-					<uni-forms-item v-if="type === 0" label="微信账号" required name="accountNo">
-						<uni-easyinput v-model="accountInfo.accountNo" placeholder="请输入微信账号"
-                           :clearable="false"
-                           :inputBorder="false" />
-					</uni-forms-item>
-          <uni-forms-item label="微信收款码" required name="imgUrl">
+          <uni-forms-item v-if="type === 0" label="微信收款码" required name="imgUrl">
             <uni-file-picker limit="1" file-mediatype="image" title="请上传微信收款码!" file-extname="png,jpg,jpeg"
                              @select="selectImage" @delete="deleteImg">
             </uni-file-picker>
@@ -57,10 +52,10 @@
 			<view>
 				<button class="confirmBtn" size="default" @click="$noMultipleClicks(submitAccount)">确定添加</button>
 			</view>
-			<view>
-				<text class="textstyle">本人确认已同意并遵守<text class="specialText" @click="goto('/pages-userInfo/setting/compoSign')">《艺术家合作协议》</text> 及
-				<text class="specialText" @click="goto('/pages-userInfo/setting/secretSign')">《艺术家隐私协议》</text>的基础上，承诺已阅读并同意遵守<text class="specialText" 
-				@click="goto('/pages-userInfo/setting/secretSign')">《共享经济合作合办协议》</text>，按照协议内容提供合法合规服务。</text>
+			<view class="textstyle">
+        本人确认已同意并遵守<navigator url="/pages-userInfo/setting/compoSign" :style="{color: primaryColor, display: 'contents'}">《艺术家合作协议》</navigator> 及
+          <navigator url="/pages-userInfo/setting/secretSign" :style="{color: primaryColor, display: 'contents'}">《艺术家隐私协议》</navigator>的基础上，承诺已阅读并同意遵守
+          <navigator url="/pages-userInfo/setting/secretSign" :style="{color: primaryColor, display: 'contents'}">《共享经济合作合办协议》</navigator>，按照协议内容提供合法合规服务。
 			</view>
 		</view>
 	</view>
@@ -68,10 +63,9 @@
 
 <script>
 	import {
-		getAccount,addCreatorAccount,
+		addCreatorAccount,
 		checkAccountExist,checkAccountUpToFour
 	} from '@/api/userInfo.js'
-  import {type} from "../../uni_modules/uni-forms/components/uni-forms/utils";
 	export default {
 		data() {
 			return {
@@ -112,7 +106,7 @@
 							required: true,
 							errorMessage: '请输入身份证号'
 						},{
-							pattern: '[1-9]\\d{5}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}[\\dXx]',
+							pattern: /^[1-9][0-9]{5}(19|20)[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}([0-9]|X)$/,
 							errorMessage: '请输入正确的身份证号'
 						}]
 					},
@@ -120,13 +114,20 @@
 						rules: [
 							{
 								required: true,
-								errorMessage: '请输入支付宝账号'
+								errorMessage: '请输入收款账号'
 							},
 							{
 								validateFunction: this.checkAccount,
 							}
 						]
 					},
+          imgUrl: {
+            rules: [{
+              required: true,
+              errorMessage: '请选择一张头像图片上传'
+            }
+            ]
+          },
 					phone: {
 						rules: [{
 								required: true,
@@ -161,7 +162,6 @@
 		created() {
 			const userInfo = uni.getStorageSync('userInfo')
 			if (!userInfo) {
-				console.log('havent userInfo')
 				uni.showModal({
 					content: '艺术家账户过期,请重新登录！',
 					showCancel: false,
@@ -174,7 +174,6 @@
 				});
 			} else {
 				this.userInfo = userInfo;
-				console.log('have userInfo')
 			}
 			
 			this.checkAccountUpToFour();
@@ -185,37 +184,29 @@
 			async checkAccountUpToFour() {
 			  const res = await checkAccountUpToFour(this.userInfo.id);
 			  if (res.data.code === 200) {
-				if(res.data.data != true){
-					//不存在则放行，存在则提示
-					this.upToFourFlag = false;
-					console.log('status',this.upToFourFlag)
-					return;
-				}else{
-					this.upToFourFlag = true;
-					console.log('status',this.upToFourFlag)
-				}
+          this.upToFourFlag = res.data.data == true;
 			  } else {
-				uni.showModal({
-					content: '检查收款账户失败！',
-					showCancel: false
-				});
+          uni.showModal({
+            content: '检查收款账户失败！',
+            showCancel: false
+          });
 			  }
 			},
 			
 			//检查艺术家收款账户是否存在
-			checkAccount(){
+			checkAccount() {
 				return new Promise((resolve, reject) => {
 					let that = this;
 					const param = {
 						creatorId: that.userInfo.id,
 						accountNo:that.accountInfo.accountNo
 					}
-					checkAccountExist(param).then(res => {
+          checkAccountExist(param).then(res => {
 						if (res.data.code === 200) {
-							if(res.data.data != true){
+							if(res.data.data !== true){
 								//不存在则放行，存在则提示
 								that.existFlag = false;
-								return;
+								return resolve();
 							}else{
 								that.existFlag = true;
 								return reject(new Error('该收款账户已存在'))
@@ -259,75 +250,92 @@
             },
           })
           const back = JSON.parse(res.data);
-          if (back.code == 200) {
+          if (back.code === 200) {
             that.accountInfo.imgUrl = back.data;
           }
         }
         uni.hideLoading()
+        that.submitFormDataA(that);
       },
 			//保存数据并跳转
-			submitAccount(){
-				let that = this;
-				if(that.existFlag == true){
-					uni.showModal({
-						content: '收款账户已存在！',
-						showCancel: false
-					});
-				}else{
-					if(that.upToFourFlag == true){
-						uni.showModal({
-							content: '绑定收款账户已达最大上限！',
-							showCancel: false,
-							success() {
-								uni.redirectTo({
-									url: '/pages-userInfo/creatorAccount/creatorAccount'
-								})
-							}
-						});
-					}else{
-						const param = {
-							creatorId: that.userInfo.id,
-							name: that.accountInfo.name,
-							idNo: that.accountInfo.idNo,
-							phone:that.accountInfo.phone,
-							accountNo:that.accountInfo.accountNo,
-							type: that.type //此处默认先添加为支付宝账户，后续微信支付了即可添加微信
-						}
-						if (param.type === 0) { //上传收款码
-              that.uploadImg(that.fileList);
+			submitAccount() {
+        let that = this;
+        that.$refs.form.validate([], (err, formData) => {
+          if (!err) {
+            if(that.existFlag === true){
+              uni.showModal({
+                content: '收款账户已存在！',
+                showCancel: false
+              });
+            }else{
+              if(that.upToFourFlag === true){
+                uni.showModal({
+                  content: '绑定收款账户已达最大上限！',
+                  showCancel: false,
+                  success() {
+                    uni.redirectTo({
+                      url: '/pages-userInfo/creatorAccount/creatorAccount'
+                    })
+                  }
+                });
+              }else{
+                if (that.type === 0) {
+                  that.uploadImg(that.fileList)
+                } else {
+                  that.submitFormDataA(that);
+                }
+              }
             }
-						//新增艺术家账户
-						addCreatorAccount(param).then(res => {
-							if (res.data.code === 200) {
-								uni.hideLoading();
-								uni.showToast({
-									title:'添加成功!',
-									duration: 1500,
-									success() {
-										setTimeout(function () {
-											uni.redirectTo({
-												url: '/pages-userInfo/creatorAccount/creatorAccount'
-											})
-										}, 1500);
-									}
-								})
-							}else{
-								uni.showModal({
-									content: '添加收款账户失败！',
-									showCancel: false
-								});
-							}
-						});
-					}
-				}
+          } else  {
+            uni.showToast({
+              title: '表单验证未通过,请更正后提交!',
+              icon: 'none',
+              duration: 3000
+            })
+          }
+        })
 			},
-			
+			submitFormDataA: (e) => {
+        let that = e;
+        const param = {
+          creatorId: that.userInfo.id,
+          name: that.accountInfo.name,
+          idNo: that.accountInfo.idNo,
+          phone:that.accountInfo.phone,
+          accountNo:that.accountInfo.accountNo,
+          type: that.type //此处默认先添加为支付宝账户，后续微信支付了即可添加微信
+        }
+        if (param.type === 0) { //上传收款码
+          param.imgUrl = that.accountInfo.imgUrl
+        }
+        //新增艺术家账户
+        addCreatorAccount(param).then(res => {
+          if (res.data.code === 200) {
+            uni.hideLoading();
+            uni.showToast({
+              title:'添加成功!',
+              duration: 1500,
+              success() {
+                setTimeout(function () {
+                  uni.redirectTo({
+                    url: '/pages-userInfo/creatorAccount/creatorAccount'
+                  })
+                }, 1500);
+              }
+            })
+          }else{
+            uni.showModal({
+              content: '添加收款账户失败！',
+              showCancel: false
+            });
+          }
+        });
+      },
 			//跳转到置顶路径
 			goto:function(url){
-				console.log('111111111111111111111')
-				// uni.navigateTo({
-				// 	url: url
-				// })
+				uni.navigateTo({
+					url: url
+				})
 			},
 		},
     watch: {
@@ -370,6 +378,16 @@
     color: $uni-white !important;
   }
 
+  ::v-deep .uni-file-picker__header {
+    .file-title {
+      font-size: 24rpx;
+      color: #999;
+    }
+    .file-count {
+      font-size: 24rpx;
+      color: #999;
+    }
+  }
 }
 
 .foot {
@@ -383,6 +401,8 @@
 .textstyle{
   font-size: 26rpx;
   color: $uni-secondary-color;
+  padding-top: 10rpx;
+  padding-bottom: 40rpx;
 }
 
 .text-white {
diff --git a/pages-userInfo/creatorAccount/creatorAccount.vue b/pages-userInfo/creatorAccount/creatorAccount.vue
index 1367c91..5a370b7 100644
--- a/pages-userInfo/creatorAccount/creatorAccount.vue
+++ b/pages-userInfo/creatorAccount/creatorAccount.vue
@@ -217,9 +217,10 @@
 }
 
 .slot-box{
-  font-size: 30rpx;
+  font-size: 26rpx;
   text-align: justify;
-  color: $uni-secondary-color;
+  color: $uni-white;
+  line-height: 46rpx;
 }
 .line-box{
   border-bottom: 2rpx $uni-secondary-color solid;
diff --git a/pages/index/upload/upload.vue b/pages/index/upload/upload.vue
index 159d0dd..1ea3561 100644
--- a/pages/index/upload/upload.vue
+++ b/pages/index/upload/upload.vue
@@ -24,6 +24,11 @@
       </uni-file-picker>
       <view class="uploadNum">今日还可上传次数<span class="uploadText"> {{ getUploadNum }} </span>，已上传次数<span class="uploadText"> {{ uploadedNum }} </span></view>
     </view>
+    <uni-section title="是否原创" subTitle="非原创则视为网络图片" type="circle">
+      <view class="original-item-list">
+        <uni-data-checkbox multiple v-model="original" :localdata="originalList" :selectedColor="primaryColor" :selectedTextColor="primaryColor"></uni-data-checkbox>
+      </view>
+    </uni-section>
     <uni-section title="选择图片标签" subTitle="最多选择3个" type="circle">
     </uni-section>
     <view class="section-content">
@@ -46,7 +51,7 @@
 		data() {
 			return {
 				styleType: 'button',
-				activeColor: '#007aff',
+        primaryColor: '#0b6375',
 				typeCurrent: 0,
 				typeId: 1,
         fileExtname: "png,jpg,jpeg",
@@ -61,6 +66,10 @@
 				userInfo:{},
 				uploadedNum: 0,
 				noClick:true, //防止重复提交
+        original: [],
+        originalList: [
+          {text: "原创", value: 1}
+        ]
 			}
 		},
 		created() {
@@ -144,7 +153,7 @@
 					creatorId: that.userInfo.id
 				}
 				const res = await queryUploadNum(checkParam);
-				console.log(res)
+				// console.log(res)
 				if(res.data.code === 200){
 					that.uploadedNum = res.data.data;
 				}else{
@@ -178,7 +187,7 @@
 			},
 			//文件上传成功监听事件
 			successHandler(e){
-				console.log('文件上传成功！'+e)
+				// console.log('文件上传成功！'+e)
 			},
 			//選擇文件监听事件
 			selectHandler(e){
@@ -199,11 +208,11 @@
 			},
 			//文件上传失败监听事件
 			failHandler(e){
-				console.log('文件上传失败！'+e)
+				// console.log('文件上传失败！'+e)
 			},
 			//文件删除监听事件
 			deleteHandler(e){
-				console.log('文件删除',e.tempFile.url)
+				// console.log('文件删除',e.tempFile.url)
 				//调用文件删除方法
         let that = this;
         that.fileList = that.fileList?.filter?.(item => {
@@ -288,7 +297,8 @@
 							imgUrl: that.imgList,
 							signList: that.signListSelected,
 							status: 0,
-							typeId: that.typeId
+							typeId: that.typeId,
+              isOriginal: that.original?.length > 0 ? 1 : 0
 						}
 						  insertTiktokImg(param).then(res =>{
 							// console.log('res',res)
@@ -349,6 +359,22 @@
       font-size: 28rpx !important;
     }
 
+    .original-item-list {
+      width: 654rpx;
+      margin: 0 auto;
+
+      ::v-deep .checklist-text {
+        color: $uni-secondary-color !important;
+        font-size: 24rpx !important;
+      }
+
+      ::v-deep .is-checked .checklist-text {
+        color: $uni-primary !important;
+        font-size: 24rpx !important;
+      }
+
+    }
+
     .section-content {
       width: 654rpx;
       margin: 0 auto;
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 18c9c88..774b675 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -290,12 +290,12 @@
 			},
 			// 上传成功
 			imgUploadSuccess(e) {
-				console.log('上传成功')
+				// console.log('上传成功')
 			},
 
 			// 上传失败
 			imgUploadFail(e) {
-				console.log('上传失败：', e)
+				// console.log('上传失败：', e)
 			},
       submit() {
         let that = this;