diff --git a/template/admin/src/components/mobilePageDiy/home_product.vue b/template/admin/src/components/mobilePageDiy/home_product.vue index 4f08b641a..0d4ab04ae 100644 --- a/template/admin/src/components/mobilePageDiy/home_product.vue +++ b/template/admin/src/components/mobilePageDiy/home_product.vue @@ -53,7 +53,7 @@ class="label" :style="'border:1px solid ' + labelColor + ';color:' + labelColor" :class="priceShow ? '' : 'on'" - v-if="couponShow && item.checkCoupon" + v-if="couponShow" > 券 @@ -408,6 +408,7 @@ export default { text-align center line-height 18px font-size 11px + border-radius 3px &.on margin-left 0; diff --git a/template/admin/src/pages/marketing/lottery/addGoods.vue b/template/admin/src/pages/marketing/lottery/addGoods.vue index decf2880e..1ceaccf61 100644 --- a/template/admin/src/pages/marketing/lottery/addGoods.vue +++ b/template/admin/src/pages/marketing/lottery/addGoods.vue @@ -223,7 +223,7 @@ export default { let keys = Object.keys(this.editData); keys.forEach((item) => { this.formValidate[item] = this.editData[item]; - if (item === 'coupon_title') { + if (item === 'coupon_title' && this.editData[item]) { this.couponName.push({ title: this.editData[item], id: this.editData.coupon_id, diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue index 9c7b14351..1721ff892 100644 --- a/template/admin/src/pages/product/productAdd/index.vue +++ b/template/admin/src/pages/product/productAdd/index.vue @@ -294,7 +294,7 @@ > - +
-
+
diff --git a/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue b/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue index c7faeaf65..eb289a2bb 100644 --- a/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue +++ b/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue @@ -392,13 +392,13 @@ bottom: 0px; width: 100%; height: 30px; - background-color: rgb(231, 27, 27, .5); + background-color: rgb(197, 150, 63, 0.5); line-height: 30px; color: #fff; } .suc-bg { - background-color: rgba(92, 184, 92, .5); + background-color: rgb(197, 150, 63, 0.5); filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C); } diff --git a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue index e1338bc1c..770935571 100644 --- a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue +++ b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue @@ -11,7 +11,7 @@ {{ tipWords }} + :class="passFalg ? 'suc-bg' : 'err-bg'">{{ tipWords }} @@ -123,7 +123,7 @@ export default { data() { return { secretKey: "", // 后端返回的加密秘钥 字段 - passFlag: "", // 是否通过的标识 + passFalg: "", // 是否通过的标识 backImgBase: "", // 验证码背景图片 blockBackImgBase: "", // 验证滑块的背景图片 backToken: "", // 后端返回的唯一token值 @@ -491,13 +491,13 @@ export default { bottom: 0px; width: 100%; height: 30px; - background-color: rgb(231, 27, 27, .5); + background-color: rgb(197, 150, 63, 0.5); line-height: 30px; color: #fff; } .suc-bg { - background-color: rgba(92, 184, 92, .5); + background-color: rgb(197, 150, 63, 0.5); filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C); } diff --git a/template/uni-app/pages/index/diy/components/activeParty.vue b/template/uni-app/pages/index/diy/components/activeParty.vue index c58474a3e..b74265e68 100644 --- a/template/uni-app/pages/index/diy/components/activeParty.vue +++ b/template/uni-app/pages/index/diy/components/activeParty.vue @@ -1,195 +1,197 @@ - - - - - \ No newline at end of file + + + + + diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue index 046e54633..bcbd84a81 100644 --- a/template/uni-app/pages/order_addcart/order_addcart.vue +++ b/template/uni-app/pages/order_addcart/order_addcart.vue @@ -706,18 +706,19 @@ addCart: function(index) { let that = this; let item = that.cartList.valid[index]; - item.cart_num = Number(item.cart_num) + 1; + let lastnum = Number(item.cart_num) + 1 let productInfo = item.productInfo; - if (productInfo.hasOwnProperty('attrInfo') && item.cart_num >= item.productInfo.attrInfo.stock) { - item.cart_num = item.productInfo.attrInfo.stock; + if (productInfo.hasOwnProperty('attrInfo') && lastnum >= item.productInfo.attrInfo.stock) { + lastnum = item.productInfo.attrInfo.stock; item.numAdd = true; item.numSub = false; } else { item.numAdd = false; item.numSub = false; } - that.setCartNum(item.id, item.cart_num, function(data) { + that.setCartNum(item.id, lastnum, (data) => { that.cartList.valid[index] = item; + item.cart_num = Number(item.cart_num) + 1; that.getCartNum(); that.switchSelect(); }); diff --git a/template/uni-app/pages/points_mall/integral_goods_details.vue b/template/uni-app/pages/points_mall/integral_goods_details.vue index 795d816b8..89d3c2441 100644 --- a/template/uni-app/pages/points_mall/integral_goods_details.vue +++ b/template/uni-app/pages/points_mall/integral_goods_details.vue @@ -1,1178 +1,1187 @@ - - - - - diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue index 57c2effb7..0eaa34a76 100644 --- a/template/uni-app/pages/user/index.vue +++ b/template/uni-app/pages/user/index.vue @@ -52,7 +52,7 @@ - + {{$t('请点击授权')}} diff --git a/template/uni-app/pages/users/components/verify/verifySlider/index.vue b/template/uni-app/pages/users/components/verify/verifySlider/index.vue index c7faeaf65..4581bab9f 100644 --- a/template/uni-app/pages/users/components/verify/verifySlider/index.vue +++ b/template/uni-app/pages/users/components/verify/verifySlider/index.vue @@ -392,13 +392,13 @@ bottom: 0px; width: 100%; height: 30px; - background-color: rgb(231, 27, 27, .5); + background-color: rgb(197, 150, 63, 0.5);; line-height: 30px; color: #fff; } .suc-bg { - background-color: rgba(92, 184, 92, .5); + background-color: rgb(197, 150, 63, 0.5);; filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C); } diff --git a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue index e1338bc1c..39160aeaf 100644 --- a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue +++ b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue @@ -11,7 +11,7 @@ {{ tipWords }} + :class="passFalg ? 'suc-bg' : 'err-bg'">{{ tipWords }} @@ -123,7 +123,7 @@ export default { data() { return { secretKey: "", // 后端返回的加密秘钥 字段 - passFlag: "", // 是否通过的标识 + passFalg: "", // 是否通过的标识 backImgBase: "", // 验证码背景图片 blockBackImgBase: "", // 验证滑块的背景图片 backToken: "", // 后端返回的唯一token值 @@ -491,13 +491,13 @@ export default { bottom: 0px; width: 100%; height: 30px; - background-color: rgb(231, 27, 27, .5); + background-color: rgb(197, 150, 63, 0.5);; line-height: 30px; color: #fff; } .suc-bg { - background-color: rgba(92, 184, 92, .5); + background-color: rgb(197, 150, 63, 0.5);; filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C); } diff --git a/template/uni-app/pages/users/user_sgin_list/index.vue b/template/uni-app/pages/users/user_sgin_list/index.vue index 100ffed19..02625a131 100644 --- a/template/uni-app/pages/users/user_sgin_list/index.vue +++ b/template/uni-app/pages/users/user_sgin_list/index.vue @@ -10,7 +10,7 @@ {{$t(itemn.title)}} {{itemn.add_time}} - +{{itemn.number}} + +{{itemn.number}}