Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/components/from/from.vue

@@ -58,6 +58,7 @@ export default {
     return {
       modals: false,
       type: 0,
+      loading: false,
       config: {
         global: {
           upload: {
@@ -83,6 +84,8 @@ export default {
     onSubmit(formData) {
       let datas = {};
       datas = formData;
+      if (this.loading) return;
+      this.loading = true;
       request({
         url: this.FromData.action,
         method: this.FromData.method,
@@ -95,8 +98,10 @@ export default {
           setTimeout(() => {
             this.$emit('submitFail');
           }, 1000);
+          this.loading = false;
         })
         .catch((res) => {
+          this.loading = false;
           this.$Message.error(res.msg);
         });
     },

template/admin/src/components/main/components/tags-nav/tags-nav.less

@@ -69,7 +69,7 @@
     .scroll-body {
       height: ~'calc(100% - 1px)';
       display: inline-block;
-      padding: 3px 20px 0 20px;
+      padding: 3px 40px 0 20px;
       position: absolute;
       overflow: visible;
       white-space: nowrap;

template/admin/src/pages/marketing/channelCode/createCode.vue

@@ -502,10 +502,11 @@ export default {
 }
 
 textarea {
-  padding: 5px;
+  padding: 0 5px;
   border-radius: 3px;
   border-color: #c5c8ce;
   outline-color: #2d8cf0;
+  font-size: 14px;
 }
 
 .picBox {

template/admin/src/pages/marketing/live/anchor.vue

@@ -122,8 +122,12 @@ export default {
         .then((res) => {
           this.$Message.success(res.msg);
           this.labelLists.splice(num, 1);
-
-          this.getList();
+          if (!this.labelLists.length && this.labelFrom.page != 1) {
+            this.labelFrom.page -= 1;
+            this.getList();
+          } else {
+            this.getList();
+          }
         })
         .catch((res) => {
           this.$Message.error(res.msg);

template/admin/src/pages/order/invoice/index.vue

@@ -94,7 +94,7 @@
         </template>
         <template slot-scope="{ row, index }" slot="is_invoice">
           <div v-if="row.is_invoice === 1">已开票</div>
-          <div v-else>未开票</div>
+          <div v-else>--</div>
         </template>
         <template slot-scope="{ row, index }" slot="status">
           <div v-if="row.status === 0">未发货</div>

template/admin/src/utils/modalForm.js

@@ -90,6 +90,7 @@ export default function (formRequestPromise, { width = '700' } = { width: '700'
         };
         let btnStop = false;
         data.config.onSubmit = (formData, $f) => {
+          console.log('add')
           $f.btn.loading(true);
           $f.btn.disabled(true);
           if (btnStop) return;

template/uni-app/pages/goods_cate/goods_cate3.vue

@@ -561,6 +561,12 @@
 							title: that.$t(`该产品没有更多库存了`)
 						});
 				}
+				if (that.attr.productSelect.cart_num == 0) {
+					return that.$util.Tips({
+						title: that.$t(`不能输入0喔`)
+					});
+				}
+				console.log(that.attr.productSelect.cart_num, 'that.attr.productSelect.cart_num')
 				let q = {
 					product_id: id,
 					num: duo ? that.attr.productSelect.cart_num : 1,

template/uni-app/pages/order_addcart/order_addcart.vue

@@ -249,14 +249,12 @@
 		onLoad(options) {
 			uni.hideTabBar()
 			let that = this;
-			if (that.isLogin == false) {
-				toLogin();
-			}
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curRoute = routes[routes.length - 1].route //获取当前页面路由
 			this.activeRouter = '/' + curRoute
 		},
 		onShow() {
+			if (!this.isLogin) toLogin();
 			this.canShow = false
 			if (this.isLogin == true) {
 				this.hotPage = 1;
@@ -701,7 +699,7 @@
 						that.cartList.valid[index] = item;
 						that.getCartNum();
 						that.switchSelect();
-					}).catch(err => {
+					}, () => {
 						item.cart_num = Number(item.cart_num) + 1
 					})
 				}
@@ -724,15 +722,16 @@
 					that.cartList.valid[index] = item;
 					that.getCartNum();
 					that.switchSelect();
-				}).catch(err => {
+				}, () => {
 					item.cart_num = Number(item.cart_num) - 1
 				})
 			},
-			setCartNum(cartId, cartNum, successCallback) {
+			setCartNum(cartId, cartNum, successCallback, errorCallback) {
 				let that = this;
 				changeCartNum(cartId, cartNum).then(res => {
 					successCallback && successCallback(res.data);
 				}).catch(err => {
+					errorCallback && errorCallback()
 					return that.$util.Tips({
 						title: err
 					});

template/uni-app/pages/users/user_integral/index.vue

@@ -417,4 +417,7 @@
 		align-items: center;
 		justify-content: center;
 	}
+	.empty-box{
+		padding-bottom:  300rpx;
+	}
 </style>

template/uni-app/pages/users/user_invoice_list/index.vue

@@ -246,7 +246,7 @@
 	.list {
 		padding: 14rpx 32rpx;
 		margin-top: 90rpx;
-		margin-bottom: 140rpx;
+		padding-bottom: 180rpx;
 	}
 
 	.list .item {