bug修改

App.vue

@@ -9,9 +9,11 @@ export default {
         this.initSystemInfo()
         // 判断优惠券弹窗是否显示
         this.checkShowCouponPopup()
+        this.wechatlogin()
     },
     methods: {
         ...mapActions('app', ['setWindowHeight', 'setVariableFun']),
+        ...mapActions('user', ['wechatlogin']),
         ...mapMutations('coupon', ['setCouponPopupStatus']),
         ...mapMutations('app', ['setWindowHeight']),
         // 验证是否需要显示优惠券入口弹窗
@@ -29,7 +31,9 @@ export default {
                 success: function(e) {
                     let modelmes = e.model
                     self.setWindowHeight(e.windowHeight)
+                    console.log(modelmes)
                     // iphone x以上的版本都要控制下巴高度
+                    console.log(/iphone [1|x]\s?/i.test(modelmes))
                     if (/iphone [1|x]\s?/i.test(modelmes)) {
                         self.setVariableFun(true)
                     } else {
@@ -49,10 +53,8 @@ export default {
                     // #ifdef MP-WEIXIN || MP-QQ
                     if (e.platform == 'android') {
                         Vue.prototype.platformClass = 'left'
-                        self.setVariableFun(false)
                     } else {
                         Vue.prototype.platformClass = 'center'
-                        self.setVariableFun(true)
                     }
                     Vue.prototype.StatusBar = e.statusBarHeight
                     Vue.prototype.fontSizeSetting = e.fontSizeSetting

common/css/common.scss

@@ -265,7 +265,7 @@ button::after {
     margin-top: 74rpx;
     font-size: 26rpx;
     .asterisk {
-        color: #ff2a2a;
+        color: #ff457b;
         margin-right: 10rpx;
     }
 }

components/cm-module/cm-coupon-list/cm-coupon-list.vue

@@ -52,11 +52,11 @@
                             :image="baseUrl + 'icon-coupon-empty.png'"
                             :offset="-12"
                         ></cm-empty>
-                        <!-- 使用优惠券按钮 -->
-                        <view class="btn" @click="confirm" v-if="listType === 'use'">确定</view>
                         <!-- IPhoneX 以上版本适配 -->
-                        <view :style="{ height: isIphoneX ? '40rpx' : 0 }"></view>
+                        <view :style="{ height: isIphoneX ? '44rpx' : 0 }"></view>
                     </view>
+                    <!-- 使用优惠券按钮 -->
+                    <view class="btn" @click="confirm" v-if="listType === 'use'">确定</view>
                 </view>
             </uni-transition>
         </view>
@@ -159,10 +159,11 @@ $grid: 24rpx;
 $title-top: 50rpx;
 $title-bottom: 28rpx;
 $title-line-height: 50rpx;
-$other-line-height: 40rpx;
 $tabs-height: 80rpx;
+$unset-height: 30rpx;
 $main-height: 1028rpx;
 $base-scroll-height: $main-height - $title-top - $title-bottom - $title-line-height;
+$btn-height: 90rpx;
 .mask {
     position: fixed;
     bottom: 0;
@@ -187,10 +188,14 @@ $base-scroll-height: $main-height - $title-top - $title-bottom - $title-line-hei
             background: #fff;
             .close {
                 position: absolute;
-                top: 36rpx;
-                right: 36rpx;
+                top: 26rpx;
+                right: 26rpx;
                 font-size: 34rpx;
                 color: #b2b2b2;
+                width: 60rpx;
+                height: 60rpx;
+                text-align: center;
+                line-height: 60rpx;
             }
             .title {
                 padding: $title-top 0 $title-bottom;
@@ -202,13 +207,13 @@ $base-scroll-height: $main-height - $title-top - $title-bottom - $title-line-hei
             }
             .other {
                 padding: 0 $grid $grid;
-                line-height: $other-line-height;
                 .unset {
                     display: flex;
                     justify-content: space-between;
                     align-items: center;
                     padding-right: 30rpx;
                     font-size: 30rpx;
+                    line-height: $unset-height;
                     color: #333333;
                     .radio-flag {
                         color: #ff457b;
@@ -247,7 +252,7 @@ $base-scroll-height: $main-height - $title-top - $title-bottom - $title-line-hei
                 overflow-y: scroll;
                 // 查看优惠券
                 &.scroll-search {
-                    height: $base-scroll-height - $tabs-height;
+                    height: $base-scroll-height - $tabs-height - $grid;
                 }
                 // 领取优惠券
                 &.scroll-receive {
@@ -255,21 +260,21 @@ $base-scroll-height: $main-height - $title-top - $title-bottom - $title-line-hei
                 }
                 // 使用优惠券
                 &.scroll-use {
-                    height: $base-scroll-height - $other-line-height - $grid;
-                }
-                .btn {
-                    width: 600rpx;
-                    height: 90rpx;
-                    margin: $grid auto;
-                    background: linear-gradient(90deg, #fc32b4 0%, #f83c6c 100%);
-                    opacity: 1;
-                    border-radius: 45rpx;
-                    line-height: 90rpx;
-                    text-align: center;
-                    font-size: 30rpx;
-                    color: #ffffff;
+                    height: $base-scroll-height - $unset-height - $btn-height - 3 * $grid;
                 }
             }
+            .btn {
+                width: 600rpx;
+                height: $btn-height;
+                margin: $grid auto;
+                background: linear-gradient(90deg, #fc32b4 0%, #f83c6c 100%);
+                opacity: 1;
+                border-radius: 45rpx;
+                line-height: $btn-height;
+                text-align: center;
+                font-size: 30rpx;
+                color: #ffffff;
+            }
         }
     }
 }

components/cm-module/cm-drawer/cm-drawer.vue

@@ -140,10 +140,14 @@ $drawer-size: 100rpx;
             padding: 24rpx;
             .close {
                 position: absolute;
-                top: 36rpx;
-                right: 36rpx;
+                top: 26rpx;
+                right: 26rpx;
                 font-size: 34rpx;
                 color: #b2b2b2;
+                width: 60rpx;
+                height: 60rpx;
+                text-align: center;
+                line-height: 60rpx;
             }
             .title {
                 width: 100%;

components/cm-module/cm-goods-nav/cm-goods-nav.vue

@@ -103,6 +103,9 @@ export default {
             if (newVal) this.processActivityPrice()
         }
     },
+    created() {
+        this.options[2].info = this.kindCount
+    },
     methods: {
         ...mapActions('cart', ['addToCart', 'getCartNumber']),
         ...mapMutations('user', ['setInviteUserId']),

components/cm-module/cm-product-params/cm-product-params.vue

@@ -20,6 +20,7 @@
                 <view class="content-td">{{ item.paramsName }}：</view>
                 <view class="content-th">{{ item.paramsContent }}</view>
             </view>
+            <view class="btn" @click="$emit('close')">了解</view>
         </scroll-view>
     </cm-drawer>
 </template>
@@ -39,7 +40,7 @@ export default {
             type: Boolean,
             default: false
         }
-    },
+    }
 }
 </script>
 
@@ -72,4 +73,15 @@ export default {
         }
     }
 }
+.btn {
+    width: 100%;
+    height: 88rpx;
+    margin-top: 32px;
+    background: #ff457b;
+    line-height: 88rpx;
+    text-align: center;
+    color: #ffffff;
+    font-size: 28rpx;
+    border-radius: 44rpx;
+}
 </style>

components/cm-module/cm-product/cm-product.vue

@@ -64,6 +64,7 @@ $grid: 24rpx;
     height: $height;
     background: #fff;
     border-radius: $radius;
+    overflow: hidden;
     .recommend {
         position: absolute;
         top: 0;

components/cm-module/createOrder/goodsList.vue

@@ -233,7 +233,7 @@
 						line-height: 54rpx;
 						font-size: $font-size-28;
 						width: 48%;
-						color: #FF2A2A;
+						color: #ff457b;
 						float: left;
 						&.disabled{
 							color: #999999;
@@ -351,7 +351,7 @@
 					display: flex;
 					justify-content: flex-end;
 					.money{
-						color: #FF2A2A;
+						color: #ff457b;
 						font-size: $font-size-28;
 					}
 				}

components/cm-module/createOrder/sellerFreight.vue

@@ -496,7 +496,7 @@
 				line-height: 44rpx;
 				font-size: $font-size-28;
 				.p{
-					color: #FF2A2A;
+					color: #ff457b;
 				}
 				.p:first-child{
 					margin-left: 30rpx;

components/cm-module/createOrder/sellerInvoice.vue

@@ -679,7 +679,7 @@
 				line-height: 44rpx;
 				font-size: $font-size-28;
 				.p{
-					color: #FF2A2A;
+					color: #ff457b;
 				}
 				.p:first-child{
 					margin-left: 30rpx;

components/cm-module/createOrder/sellerRegulations.vue

@@ -426,7 +426,7 @@
 				line-height: 44rpx;
 				font-size: $font-size-28;
 				.p{
-					color: #FF2A2A;
+					color: #ff457b;
 				}
 				.p:first-child{
 					margin-left: 30rpx;

components/cm-module/listTemplate/productList.vue

@@ -355,12 +355,12 @@ export default {
 			border-radius: 6rpx;
 			background-color: #FFFFFF;
 			line-height: 28rpx;
-			color: #ff2a2a;
+			color: #ff457b;
 			text-align: center;
 			display: inline-block;
 			padding:0 5rpx;
 			font-size: $font-size-20;
-			border: 1px solid #ff2a2a;
+			border: 1px solid #ff457b;
 			float: left;
 		}
 	}
@@ -394,7 +394,7 @@ export default {
 		.price-small {
 			font-size: $font-size-24;
 			line-height: 40rpx;
-			color: #ff2a2a;
+			color: #ff457b;
 		}
 	}
 	.list-shop {
@@ -402,7 +402,7 @@ export default {
 		float: left;
 		.list-price {
 			width: 100%;
-			color: #ff2a2a;
+			color: #ff457b;
 			float: left;
 			line-height: 54rpx;
 			align-items: center;

components/cm-module/orderDetails/goodsList.vue

@@ -266,7 +266,7 @@
 						line-height: 48rpx;
 						font-size: $font-size-28;
 						width: 48%;
-						color: #FF2A2A;
+						color: #ff457b;
 						float: left;
 					}
 					.count{

components/cm-module/orderDetails/orderInformation.vue

@@ -202,12 +202,12 @@ export default {
             // 	font-weight: bold;
             // }
             .red {
-                color: #ff2a2a;
+                color: #ff457b;
             }
             .view-type {
                 float: right;
                 text-align: right;
-                color: #ff2a2a;
+                color: #ff457b;
                 flex: 4;
             }
             .clipboard {

components/cm-module/orderDetails/paymentRecord.vue

@@ -102,7 +102,7 @@
 				.record-title-r{
 					float: right;
 					.red{
-						color: #FF2A2A;
+						color: #ff457b;
 						font-weight: bold;
 					}
 				}

components/cm-module/orderDetails/refundRecord.vue

@@ -81,7 +81,7 @@
 				.record-title-r{
 					float: right;
 					.red{
-						color: #FF2A2A;
+						color: #ff457b;
 						font-weight: bold;
 					}
 				}

components/cm-module/productDetails/cm-activipopu.vue

@@ -122,7 +122,7 @@ export default {
         text-align: left;
         line-height: 56rpx;
         .txt {
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
     .box-product {

components/cm-module/productDetails/cm-price-activity.vue

@@ -251,7 +251,7 @@ export default {
         text-align: left;
         line-height: 56rpx;
         .txt {
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
     .box-product {

components/cm-module/productDetails/cm-price.vue

@@ -250,7 +250,7 @@ export default {
         text-align: left;
         line-height: 56rpx;
         .txt {
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
     .box-product {

components/thorui/tui-tag/tui-tag.vue

@@ -120,7 +120,7 @@ export default {
 }
 
 .tui-red {
-	background-color: #ff2a2a !important;
+	background-color: #ff457b !important;
 	color: #fff;
 }
 

components/uni-components/uni-goods-nav/uni-goods-nav.vue

@@ -11,6 +11,7 @@
                         :key="index"
                         @click="onClick(index, item)"
                         v-if="item.type === 'contact'"
+                        open-type="contact"
                     >
                         <view class="uni-tab__icon">
                             <uni-icons :type="item.icon" size="18" color="#666"></uni-icons>

pages/goods/list.vue

@@ -411,7 +411,7 @@ page {
             line-height: 44rpx;
             font-size: $font-size-32;
             .p {
-                color: #ff2a2a;
+                color: #ff457b;
             }
             // .p:first-child{
             // 	margin-left: 30rpx;

pages/goods/product-activi.vue

@@ -363,7 +363,6 @@ export default {
         if (this.isShareType == 'share') {
             // 收集分享信息
             this.setInviteUserId(option.inviteUserId)
-            wxLogin.wxLoginAuthorize()
         }
         if (option.page == 2) {
             this.backPage = option.page
@@ -843,7 +842,7 @@ page {
         }
         .wrap-main-text {
             line-height: 56rpx;
-            color: #ff2a2a;
+            color: #ff457b;
             font-size: $font-size-26;
             display: block;
             float: left;
@@ -1248,7 +1247,7 @@ page {
             }
             .animation-num {
                 font-size: $font-size-32;
-                color: #ff2a2a;
+                color: #ff457b;
                 position: absolute;
                 top: -12rpx;
                 right: 4rpx;
@@ -1654,7 +1653,7 @@ page {
             line-height: 44rpx;
             font-size: $font-size-28;
             .p {
-                color: #ff2a2a;
+                color: #ff457b;
             }
             .p:first-child {
                 margin-left: 30rpx;

pages/goods/product-detail.vue

@@ -351,6 +351,7 @@ $swiper-width: 750rpx;
                 border: 1rpx solid #ff457b;
                 border-radius: 8rpx;
                 margin-left: 8rpx;
+                box-sizing: border-box;
             }
             .iconfont {
                 margin-left: 24rpx;

pages/goods/product.vue

@@ -389,7 +389,6 @@ export default {
         if (this.isShareType == 'share') {
             // 收集分享信息
             this.setInviteUserId(option.inviteUserId)
-            wxLogin.wxLoginAuthorize()
         }
         if (option.page == 2) {
             this.backPage = option.page
@@ -856,7 +855,7 @@ page {
         }
         .wrap-main-text {
             line-height: 56rpx;
-            color: #ff2a2a;
+            color: #ff457b;
             font-size: $font-size-26;
             display: block;
             float: left;
@@ -1297,7 +1296,7 @@ page {
             }
             .animation-num {
                 font-size: $font-size-32;
-                color: #ff2a2a;
+                color: #ff457b;
                 position: absolute;
                 top: -12rpx;
                 right: 4rpx;
@@ -1703,7 +1702,7 @@ page {
             line-height: 44rpx;
             font-size: $font-size-28;
             .p {
-                color: #ff2a2a;
+                color: #ff457b;
             }
             .p:first-child {
                 margin-left: 30rpx;

pages/goods/search.vue

@@ -148,7 +148,6 @@ export default {
         if (option.type == 'share') {
             // 收集分享信息
             this.setInviteUserId(option.inviteUserId)
-            wxLogin.wxLoginAuthorize()
         }
         this.listQuery.userId = this.userId
         if (option.keyWord) {

pages/tabBar/index/index.vue

@@ -118,11 +118,9 @@ export default {
     methods: {
         ...mapMutations('coupon', ['updatePopupType']),
         ...mapMutations('user', ['setInviteUserId']),
-        ...mapActions('user', ['wechatlogin']),
         ...mapActions('cart', ['getCartNumber']),
         // 首页初始化
         async init() {
-            this.wechatlogin()
             try {
                 await this.GetHomeBanner() // 轮播图
                 await this.GetHomeProductList() // 楼层

pages/user/activity/activity.vue

@@ -64,7 +64,9 @@ export default {
     },
     onLoad(option) {
         // 收集分享信息
-        if (option.type && option.type === 'share') this.setInviteUserId(option.inviteUserId)
+        if (option.type && option.type === 'share') {
+            this.setInviteUserId(option.inviteUserId)
+        }
         this.listQuery.activityId = option.activityId
         this.listQuery.userId = this.userId
         this.activityName = option.name

pages/user/activity/coupon-find-list.vue

@@ -55,6 +55,7 @@
 
 <script>
 import MessagePopup from '@/components/message-popup/message-popup.vue'
+import CmDrawer from '@/components/cm-module/cm-drawer/cm-drawer.vue'
 import CmCoupon from '@/components/cm-module/cm-coupon/cm-coupon.vue'
 import CmEmpty from '@/components/cm-module/cm-empty/cm-empty.vue'
 import { mapGetters } from 'vuex'
@@ -62,7 +63,8 @@ export default {
     components: {
         MessagePopup,
         CmCoupon,
-        CmEmpty
+        CmEmpty,
+        CmDrawer
     },
     data() {
         return {
@@ -132,7 +134,7 @@ export default {
 $tip-height: 80rpx;
 $grid: 24rpx;
 .coupon-find-list {
-    min-height: 100%;
+    min-height: 100vh;
     box-sizing: border-box;
     padding-top: $tip-height;
     background: #f7f7f7;

pages/user/activity/coupon-list.vue

@@ -109,9 +109,9 @@ export default {
         ...mapGetters(['isIphoneX', 'userId', 'unusedNum', 'expiredNum', 'usedNum']),
         swiperHeight() {
             if (this.isIphoneX) {
-                return this.windowHeight - 120
+                return this.windowHeight - 144
             }
-            return this.windowHeight - 80
+            return this.windowHeight - 120
             // return this.swiperHeight
         },
         // 当前选中tab对应的优惠券列表信息
@@ -205,19 +205,19 @@ export default {
                 console.log('触底了')
                 this.fetchCouponList()
             }, 200)
-        }
+        },
+        couponClick(){}
     }
 }
 </script>
 
 <style lang="scss" scoped>
-page {
+.coupon-find-list {
     width: 100%;
-    height: 100%;
+    min-height: 100vh;
     background: #f7f7f7;
 }
 .swiper {
-    height: 800rpx;
     background: #f7f7f7;
     .coupon-list {
         height: 100%;

pages/user/address/address.vue

@@ -59,6 +59,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'    
 export default {
     data() {
         return {
@@ -88,6 +89,9 @@ export default {
         }
         this.setScrollHeight()
     },
+    computed:{
+        ...mapGetters(['userId'])
+    },
     methods: {
         setScrollHeight() {
             // 窗口高度 - 底部距离
@@ -105,23 +109,21 @@ export default {
         },
         GetAddressList() {
             // 初始化地址列表
-            this.$api.getComStorage('userInfo').then(resolve => {
-                this.listQuery.userId = resolve.userId ? resolve.userId : 0
-                this.UserService.QueryAddressList(this.listQuery)
-                    .then(response => {
-                        const data = response.data
-                        if (data.list && data.list.length > 0) {
-                            this.isEmpty = false
-                            this.addressList = data.list
-                            this.hasNextPage = data.hasNextPage
-                        } else {
-                            this.isEmpty = true
-                        }
-                    })
-                    .catch(error => {
-                        this.$util.msg(error.msg, 2000)
-                    })
-            })
+            this.listQuery.userId = this.userId
+            this.UserService.QueryAddressList(this.listQuery)
+                .then(response => {
+                    const data = response.data
+                    if (data.list && data.list.length > 0) {
+                        this.isEmpty = false
+                        this.addressList = data.list
+                        this.hasNextPage = data.hasNextPage
+                    } else {
+                        this.isEmpty = true
+                    }
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
         },
         GetOnReachBottomAddressList() {
             //上滑加载

pages/user/order/create-order.vue

@@ -24,6 +24,7 @@
                 :showStatus="false"
                 :couponList="receiveCouponList"
                 @chooseCoupon="chooseCoupon"
+                @confirm="closeCouponList"
                 :currentId="currentCouponId"
             ></cm-coupon-list>
             <!-- 运费 -->
@@ -37,7 +38,9 @@
                     <view class="footer-price">
                         <view class="sum" :class="totalFullReduction == 0 ? 'none' : ''">
                             <view class="price">总价:￥{{ payAllPrice | NumFormat }}</view>
-                            <view class="discount" v-if="discountedPrice > 0">共减 ￥{{ discountedPrice | NumFormat }}</view>
+                            <view class="discount" v-if="discountedPrice > 0"
+                                >共减 ￥{{ discountedPrice | NumFormat }}</view
+                            >
                         </view>
                     </view>
                 </view>
@@ -84,7 +87,7 @@ export default {
             addressData: {}, //初始化地址信息
             goodsData: [], //初始化商品信息
             freightData: {}, //邮费数据
-            productsList: [],
+            productList: [],
             params: {
                 userId: 0
             },
@@ -101,7 +104,9 @@ export default {
             receiveCouponList: [],
             currentCouponId: -1,
             currentCoupon: null,
-            loadingText: '正在创建订单'
+            loadingText: '正在创建订单',
+            canUseCouponList:[],
+            notUseCouponList:[],
         }
     },
     onLoad(option) {
@@ -136,13 +141,13 @@ export default {
         // 支付金额
         payAllPrice() {
             const payAllPrice = this.allPrice - this.couponAmount
-            return  payAllPrice < 0 ? 0 : payAllPrice
+            return payAllPrice < 0 ? 0 : payAllPrice
         },
         hanldOrder() {
             return {
                 order: this.orderInfo
             }
-        }
+        },
     },
     filters: {
         NumFormat(value) {
@@ -151,9 +156,6 @@ export default {
         }
     },
     methods: {
-        closeCouponList() {
-            this.couponVisible = false
-        },
         // 获取可用优惠券
         fetchCouponList() {
             this.CouponService.GetCouponByProductIds({ userId: this.userId, productIds: this.productIds }).then(res => {
@@ -163,33 +165,51 @@ export default {
         },
         // 对优惠券进行分类排序
         filterCouponList() {
-            const productList = []
-            this.goodsData.forEach(shop => productList.push(...shop.productList.map(prod => prod)))
-            let canUseCouponList = [] // 可以使用的优惠券
-            let notUseCouponList = [] // 需要凑单使用的优惠券
+            this.goodsData.forEach(shop => this.productList.push(...shop.productList.map(prod => prod)))
+            this.canUseCouponList = [] // 可以使用的优惠券
+            this.notUseCouponList = [] // 需要凑单使用的优惠券
             this.receiveCouponList.forEach(coupon => {
                 if (
                     coupon.noThresholdFlag === 1 ||
-                    (coupon.productType === 1 && allProdoceUseCheck(productList, coupon)) ||
-                    (coupon.productType === 2 && someProductUseCheck(productList, coupon))
+                    (coupon.productType === 1 && allProdoceUseCheck(this.productList, coupon)) ||
+                    (coupon.productType === 2 && someProductUseCheck(this.productList, coupon))
                 ) {
                     coupon.canSelect = true
-                    canUseCouponList.push(coupon)
+                    this.canUseCouponList.push(coupon)
                 } else {
                     coupon.canSelect = false
-                    notUseCouponList.push(coupon)
+                    this.notUseCouponList.push(coupon)
                 }
             })
             // 金额高的排前面
-            this.receiveCouponList = [...couponSort(canUseCouponList), ...couponSort(notUseCouponList)]
+            this.receiveCouponList = [...couponSort(this.canUseCouponList), ...couponSort(this.notUseCouponList)]
             // 当有可用优惠券时 默认选取第一个最优惠的
-            if (this.receiveCouponList.length > 0) {
+            if (this.canUseCouponList.length > 0) {
                 this.currentCouponId = this.receiveCouponList[0].couponId
                 this.currentCoupon = this.receiveCouponList[0]
             }
             // 显示界面
             this.isRequest = false
         },
+        // 处理优惠券列表
+        resetCouponList(){
+            // 2将当前选中的优惠券从列表中删除
+            // 3将当前选中的优惠券放入最前面
+            // 4返回最新的优惠券列表
+            // 查找选中优惠券的索引
+            const index = this.canUseCouponList.findIndex(coupon=>coupon.couponId === this.currentCouponId)
+            // 从列表中删除
+            const currentCoupon = this.canUseCouponList.splice(index, 1)
+            // 重新排序 将选中的优惠券放到最前面
+            this.canUseCouponList = [...currentCoupon, ...couponSort(this.canUseCouponList)]
+            // 重新生成receiveCouponList
+            this.receiveCouponList = [...this.canUseCouponList, ...this.notUseCouponList]
+        },
+        // 确认选中
+        closeCouponList(){
+            this.couponVisible = false
+            this.resetCouponList()
+        },
         // 选中优惠券
         chooseCoupon(coupon) {
             if (coupon.couponId > -1) {
@@ -199,7 +219,7 @@ export default {
                 this.currentCoupon = null
                 this.currentCouponId = -1
             }
-            this.couponVisible = false
+            // this.couponVisible = false
         },
         //确认订单初始化信息
         getInitCrearOrder(params) {
@@ -208,6 +228,7 @@ export default {
                     let data = response.data
                     this.goodsData = data.shopList
                     this.allPrice = data.totalPrice
+                    
                     this.fetchCouponList()
                 })
                 .catch(error => {
@@ -235,8 +256,6 @@ export default {
         orderSubmitMit() {
             //提交订单
             if (this.isSubLoading) return
-            this.isSubLoading = true
-            this.loadingText = '正在创建订单...'
             if (this.subParams.addressId == '') return this.$util.msg('请先添加收货地址～', 2000)
             // 选中的优惠券id
             this.subParams.couponId = this.currentCouponId === -1 ? '' : this.currentCouponId
@@ -253,6 +272,8 @@ export default {
                 })
                 return { shopId: el.shopId, note: el.note ? el.note : '', productInfo: productInfo }
             })
+            this.isSubLoading = true
+            this.loadingText = '正在创建订单...'
             this.OrderService.CreatedOrderSubmit(this.subParams)
                 .then(response => {
                     const data = response.data
@@ -260,6 +281,7 @@ export default {
                     this.miniWxPayFor(data)
                 })
                 .catch(error => {
+                    this.isSubLoading = false
                     this.$util.msg(error.msg, 2000)
                     this.isSubLoading = false
                 })
@@ -407,7 +429,7 @@ page {
             width: 100%;
             line-height: 58rpx;
             font-size: $font-size-24;
-            color: #ff2a2a;
+            color: #ff457b;
             text-align: right;
             float: right;
         }

pages/user/order/order-details.vue

@@ -511,7 +511,7 @@ page {
             width: 100%;
             line-height: 58rpx;
             font-size: $font-size-24;
-            color: #ff2a2a;
+            color: #ff457b;
             text-align: right;
             float: right;
         }

pages/user/order/order-list-retail.vue

@@ -830,7 +830,7 @@ page {
             font-size: $font-size-28;
             line-height: 48rpx;
             text-align: right;
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
 }

pages/user/order/order-list.vue

@@ -808,7 +808,7 @@ page {
             font-size: $font-size-28;
             line-height: 48rpx;
             text-align: right;
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
 }

pages/user/order/order-payment.vue

@@ -504,7 +504,7 @@ page {
                 float: left;
                 text-align: center;
                 .iconfont {
-                    color: #ff2a2a;
+                    color: #ff457b;
                     font-size: $font-size-36;
                     line-height: 20rpx;
                 }
@@ -515,7 +515,7 @@ page {
                 float: left;
                 line-height: 40rpx;
                 font-size: $font-size-26;
-                color: #ff2a2a;
+                color: #ff457b;
                 text-align: justify;
             }
         }
@@ -553,7 +553,7 @@ page {
                 line-height: 44rpx;
                 text-align: center;
                 &.bg-color {
-                    color: #ff2a2a;
+                    color: #ff457b;
                     line-height: 88rpx;
                 }
             }
@@ -569,7 +569,7 @@ page {
                 }
                 &.bg-color {
                     line-height: 44rpx;
-                    color: #ff2a2a;
+                    color: #ff457b;
                 }
                 .clipboard {
                     width: 84rpx;
@@ -603,7 +603,7 @@ page {
                 line-height: 44rpx;
                 text-align: center;
                 &.bg-color {
-                    color: #ff2a2a;
+                    color: #ff457b;
                     line-height: 88rpx;
                 }
             }
@@ -634,7 +634,7 @@ page {
                 }
                 &.bg-color {
                     line-height: 44rpx;
-                    color: #ff2a2a;
+                    color: #ff457b;
                 }
                 .clipboard {
                     width: 84rpx;

pages/user/order/search-order.vue

@@ -892,7 +892,7 @@ page {
             font-size: $font-size-28;
             line-height: 48rpx;
             text-align: right;
-            color: #ff2a2a;
+            color: #ff457b;
         }
     }
 }
@@ -997,7 +997,7 @@ page {
             line-height: 48rpx;
             font-size: $font-size-28;
             width: 48%;
-            color: #ff2a2a;
+            color: #ff457b;
             float: left;
             font-weight: bold;
             &.disabled {
@@ -1026,12 +1026,12 @@ page {
             border-radius: 6rpx;
             background-color: #ffffff;
             line-height: 28rpx;
-            color: #ff2a2a;
+            color: #ff457b;
             text-align: center;
             display: inline-block;
             padding: 0 5rpx;
             font-size: $font-size-20;
-            border: 1px solid #ff2a2a;
+            border: 1px solid #ff457b;
             float: left;
         }
     }