更新

components/yq-avatar/yq-avatar.vue

@@ -184,12 +184,14 @@
 				setTimeout(() => {
 					this.fSelecting = false;
 				}, 500);
+        console.log("选择图片");
 
 				uni.chooseImage({
 					count: 1,
 					sizeType: ['original', 'compressed'],
 					sourceType: ['album', 'camera'],
 					success: (r) => {
+            console.log("选择图片成功");
 						// #ifdef MP-ALIPAY
 						uni.showLoading();
 						// #endif
@@ -254,7 +256,10 @@
 								uni.hideLoading();
 							}
 						});
-					}
+					},
+          fail: (err) => {
+            console.log("选择图片错误");
+          }
 				})
 			},
 			fUpload() {
@@ -1261,7 +1266,7 @@
 	}
 </script>
 
-<style>
+<style scoped>
 	.my-canvas {
 		display: flex;
 		position: fixed !important;

pages/payment/payment_detail.vue

@@ -130,7 +130,13 @@
 
 			pickerConfirm(e) {
 				const date = new Date(e.value).format('yyyy-MM-dd');
-				if (this.pickStartShow) this.searchParams.section_startTime = date;
+				if (this.pickStartShow) {
+          this.searchParams.section_startTime = date;
+          this.searchParams.page = 1;
+          this.paymentData = [];
+          this.loadend = false;
+          this.getData();
+        }
 				if (this.pickEndShow) {
 					if (!this.searchParams.section_startTime)
 						this.searchParams.section_startTime = date;

pages/product/addGood/addGood.vue

@@ -283,7 +283,7 @@
       this.product_id = opt.product_id;
       this.import = opt.import;
       // if (!opt.product_id) this.showCommodity = true;
-      this.showCommodity = true;;
+      this.showCommodity = true;
       this.initData();
       this.initClasiffy();
       if (this.import == 1) {
@@ -652,12 +652,12 @@
           productUpdate(this.merId, this.product_id, postData)
             .then(res => {
               hideLoading()
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定, 前往商品列表页面').then(() => {
-                showCancel: false
-              }).then(() => {
                 uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {
@@ -668,15 +668,15 @@
           productCreate(this.merId, postData)
             .then(res => {
               hideLoading();
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-                showCancel: false,
-              }).then(() => {
                 if (this.import == 1) {
                   uni.$emit('importAttrValueOK', this.setFormData.import_id);
                   uni.navigateBack();
                 } else uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {

pages/product/addGood/addGood_one.vue

@@ -652,12 +652,12 @@
           productUpdate(this.merId, this.product_id, postData)
             .then(res => {
               hideLoading()
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-                showCancel: false
-              }).then(() => {
                 uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {
@@ -668,15 +668,15 @@
           productCreate(this.merId, postData)
             .then(res => {
               hideLoading();
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-                showCancel: false,
-              }).then(() => {
                 if (this.import == 1) {
                   uni.$emit('importAttrValueOK', this.setFormData.import_id);
                   uni.navigateBack();
                 } else uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {

pages/product/addGood/addGood_supply.vue

@@ -715,12 +715,12 @@
           productUpdate(this.merId, this.product_id, postData)
             .then(res => {
               hideLoading()
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-                showCancel: false
-              }).then(() => {
                 uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {
@@ -731,15 +731,15 @@
           productCreate(this.merId, postData)
             .then(res => {
               hideLoading();
-              Modal('提交成功', '点击确定，返回商品管理', {
+              Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-                showCancel: false,
-              }).then(() => {
                 if (this.import == 1) {
                   uni.$emit('importAttrValueOK', this.setFormData.import_id);
                   uni.navigateBack();
                 } else uni.redirectTo({
-                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                  url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
                 })
+              }).catch(()=>{
+                uni.navigateBack()
               })
             })
             .catch(rej => {

pages/users/embody/embody.vue

@@ -439,7 +439,7 @@
 
 				let that = this,
 					value = e.detail.value;
-				value.source = this.source
+				value.source = this.source;
 				if (that.load) return;
 				if (that.currentTab == 0) { //银行卡
 					// if (value.real_name.length == 0) return this.$util.Tips({
@@ -513,7 +513,10 @@
 						title: "您暂未设置支付密码,请前往设置!"
 					}, () => {
 						uni.navigateTo({
-							url: "/pages/users/user_modify_pwd/index?type=payPwd"
+							url: "/pages/users/user_modify_pwd/index?type=payPwd",
+              success: () => {
+                that.load = false;
+              }
 						});
 					})
 				}