修复bug

App.vue

@@ -12,6 +12,9 @@ export default {
 		}
         if (options && options.path === 'pages_category_page1/distributionModule/recruit' && options.query) {
             this.globalData.distributeRecruitItem = options.query
+        }
+        if (options && options.path === 'pages_category_page1/goodsModule/inviteSpell' && options.query) {
+            this.globalData.inviteSpellShareItem = options.query
         }
 		//判断设备是否为 iPhone
 		const self = this
@@ -86,6 +89,7 @@ export default {
 	.fs-bold{font-weight: bold;}
 	.fs-weight-300{font-weight: 300;}
 	.fs-weight-200{font-weight: 200;}
+	.fs-weight-400{font-weight: 400;}
 
 
 	.flex-display{display: flex;}

components/adWindow.vue

@@ -8,18 +8,30 @@
 					<view class="coupon-list">
 						<scroll-view :scroll-top="0" class="scrollBox" scroll-y="true">
 							<view class="item" v-for="(item, index) in couponList" :key="index">
-								<view class="money">
-									<text class="num"
-										:class="[item.discountMode ===1?'num-minus':'num-discount']">{{ item.reduceMoney }}</text>
-									<text class="text">
-										满{{ item.fullMoney }}元可用
-									</text>
-								</view>
-								<view class="text">
-									<text>
-										{{item.activityName}}
-									</text>
-								</view>
+                <view class="leftBox borderBox">
+                  <view class="boxTop"></view>
+                  <view class="boxCent"></view>
+                  <view class="boxBottom"></view>
+                </view>
+                <view class="centerBox">
+                  <view class="money">
+                    <text class="num"
+                          :class="[item.discountMode ===1?'num-minus':'num-discount']">{{ item.reduceMoney }}</text>
+                    <text class="text">
+                      满{{ item.fullMoney }}元可用
+                    </text>
+                  </view>
+                  <view class="text">
+                    <text>
+                      {{item.activityName}}
+                    </text>
+                  </view>
+                </view>
+                <view class="rightBox borderBox">
+                  <view class="boxTop"></view>
+                  <view class="boxCent"></view>
+                  <view class="boxBottom"></view>
+                </view>
 							</view>
 						</scroll-view>
 					</view>
@@ -86,6 +98,7 @@
 				NET.request(API.GetAd, {
 					triggerCondition: this.triggerCondition
 				}, 'POST').then(res => {
+          console.log('123131321323')
 					if (res.data) {
 						this.adInfo = res.data[0]
 						if (this.adInfo.jumpContent) {
@@ -144,23 +157,25 @@
 			},
 			goRoll() {
 				this.visible = false
+				console.log(this.jumpContent,'this.jumpContent')
 				switch (this.adInfo.jumpType) {
 					case 1:
 						uni.navigateTo({
 							url: '/pages_category_page1/goodsModule/goodsDetails?shopId=' + this.jumpContent
-								.shopId + '&productId=' + this.jumpContent.productId + '&skuId=' + this.jumpContent
+								.shopId + '&productId=' + this.jumpContent.id + '&skuId=' + this.jumpContent
 								.skuId
 						})
 						break
 					case 2:
+						let _id = this.jumpContent.id[this.jumpContent.id.length - 1]
 						uni.navigateTo({
-							url: `/pages_category_page1/goodsModule/goodsList?category3Id=${this.jumpContent.id}`
+							url: `/pages_category_page1/goodsModule/goodsList?category3Id=${_id}`
 						})
 						break
 					case 4:
 						uni.navigateToMiniProgram({
 							appId: this.jumpContent.appId,
-							path: this.jumpContent.id,
+							path: this.jumpContent.link,
 							success(res) {
 								// 打开成功
 							}
@@ -184,13 +199,13 @@
 	right: 0;
 	bottom: 0;
 	z-index: 55;
-	background-color: rgba(0, 0, 0, 0.5);
+	background-color: rgba(0, 0, 0, 0.7);
 }
 
 
 .mask-coupon {
 	z-index: 9999;
-	background: rgba(39, 38, 39, .15);
+	/*background: rgba(39, 38, 39, .15);*/
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -205,9 +220,9 @@
 	.ad-boxs {
 		position: relative;
 		width: 100%;
-
+		text-align: center;
 		.img {
-			width: 100%;
+			width: 70%;
 		}
 	}
 	.btn-receive {
@@ -241,6 +256,11 @@
 .ad-coupons {
 	.ad-box-warp {
 		width: 510rpx;
+		.ad-boxs {
+			.img {
+				width: 100%;
+			}
+		}
 	}
 
 	.coupon-list {
@@ -257,38 +277,63 @@
 		.item {
 			width: 100%;
 			height: 140rpx;
-			background-color: #fff;
 			margin-top: 15rpx;
 			border-radius: 8rpx;
 			display: flex;
 			position: relative;
 			align-items: center;
-
+      overflow: hidden;
 			&:first-child {
 				margin-top: 0px;
 			}
-
-			&:before,
-			&:after {
-				content: '';
-				width: 32rpx;
-				height: 32rpx;
-				background: #000;
-				border-radius: 50%;
-				display: block;
-				position: absolute;
-				top: 50%;
-				margin-top: -16rpx;
-			}
-
-			&:before {
-				left: -16rpx;
-			}
-
-			&:after {
-				right: -16rpx;
-			}
-
+      .borderBox {
+        width: 32rpx;
+        height: 140rpx;
+        overflow: hidden;
+        .boxTop {
+          width: 32rpx;
+          height: 54rpx;
+          background: #FFFFFF;
+        }
+        .boxCent {
+          height: 36rpx;
+          overflow: hidden;
+          position: relative;
+          &:after {
+            content: '';
+            width: 32rpx;
+            height: 32rpx;
+            border-radius: 50%;
+            display: block;
+            position: absolute;
+            top: 50%;
+            margin-top: -47rpx;
+            left: -15rpx;
+            border: 32rpx solid #FFFFFF;
+          }
+        }
+        .boxBottom {
+          width: 32rpx;
+          height: 54rpx;
+          background: #FFFFFF;
+        }
+      }
+      .leftBox {
+        .boxCent {
+          &:after {
+            left: -50rpx;
+          }
+        }
+      }
+      .rightBox {
+      }
+      .centerBox {
+        display: flex;
+        align-items: center;
+        height: 140rpx;
+        background: #FFFFFF;
+        flex: 1;
+      }
 			.money {
 				width: 190rpx;
 				text-align: center;

components/basics/categoryShow.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="goodRecommend">
-    <view class="product-list" v-if="productList.length>0">
+    <view class="product-list">
       <view class="product-list-box" >
         <view class="product-list-item-warp" v-for="(item,index) in productList" :key="index">
           <view class="product-list-item">
@@ -18,20 +18,36 @@
                 </view>
                 <view class="buy-count">{{item.users?item.users: 0}}人付款</view>
               </view>
-              <view class="price-warp">
-                <view class="price">
+              <div class="price-warp">
+                <!-- #ifdef MP-WEIXIN -->
+                <img class="iconImg" v-if="item.activityType == 1" src="../canvasShow/static/images/groupBuyIcon.png">
+                <img class="iconImg" v-if="item.activityType == 2" src="../canvasShow/static/images/spikeIcon.png">
+                <img class="iconImg" v-if="item.activityType == 4" src="../canvasShow/static/images/spikeIcon.png">
+                <img class="iconImg" v-if="item.activityType == 3" src="../canvasShow/static/images/discountListIcon.png">
+                <img class="iconImg" v-if="item.activityType == 5" src="../canvasShow/static/images/discountListIcon.png">
+                <img class="iconImg" v-if="item.activityType == 8" src="../canvasShow/static/images/memberCenterIcon.png">
+                <!-- #endif -->
+                <!-- #ifdef H5 || APP-PLUS -->
+                <image class="iconImg" v-if="item.activityType == 1" src="../canvasShow/static/images/groupBuyIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 2" src="../canvasShow/static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 4" src="../canvasShow/static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 3" src="../canvasShow/static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 5" src="../canvasShow/static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 8" src="../canvasShow/static/images/memberCenterIcon.png"></image>
+                <!-- #endif -->
+                <div class="price">
                   ¥ {{item.price}}
-                </view>
-                <view class="original-price">
+                </div>
+                <div class="original-price">
                   ¥ {{item.originalPrice}}
-                </view>
-              </view>
+                </div>
+              </div>
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view v-else class="emptyCart-box flex-items-plus flex-column">
+    <view v-if="ifShow" class="emptyCart-box flex-items-plus flex-column">
         <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png" mode="widthFix" />
         <label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
     </view>
@@ -55,7 +71,8 @@ name: "categoryShow",
       page:1,
       pageSize:10,
       total: 0,
-      productList: []
+      productList: [],
+      ifShow: false
     }
   },
   mounted () {
@@ -74,6 +91,9 @@ name: "categoryShow",
       }, 'GET').then(res => {
         this.productList = res.data.list
         uni.hideLoading()
+        if (this.productList.length === 0) {
+          this.ifShow = true
+        }
       }).catch(res => {
         uni.hideLoading()
       })
@@ -95,6 +115,7 @@ name: "categoryShow",
   watch: {
     'categoryid': {
       handler(newVal, oldVal) {
+        this.ifShow = false
         this.getData()
       },
       deep: true
@@ -201,6 +222,11 @@ name: "categoryShow",
         display: flex;
         align-items: baseline;
         line-height: 56upx;
+        .iconImg {
+          width: 58rpx;
+          height: 36rpx;
+          margin-right: 10rpx;
+        }
         .price{
           color: #C83732;
           font-size: 40upx;

components/canvasShow/basics/banner.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="banner" :class="'terminal' + terminal">
-    <swiper class="swiper" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
+    <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
       <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+ item.bannerUrl +')'}"  @click="jumpLink(item.linkObj)">
 <!--        <div class="a-link" @click="jumpLink(item.linkObj)"><img class="img" :src="item.bannerUrl" v-show="item.bannerUrl" mode="widthFix"></div>-->
       </swiper-item>

components/canvasShow/basics/discount/app/index.vue

@@ -9,7 +9,7 @@
       <!-- #endif -->
     </div>
     <div v-if="componentContent.arrangeType == '横向滑动' && productData.products.length > 2" class="product-list">
-      <swiper ref="mySwiper" class="swiper product-list-box" :indicator-dots="false" :autoplay="true" :display-multiple-items="2" @change="swiperChange">
+      <swiper ref="mySwiper" class="swiper product-list-box" :circular="true" :indicator-dots="false" :autoplay="true" :display-multiple-items="2" @change="swiperChange">
         <swiper-item class="swiper-slide product-list-item-warp" v-for="(item,index) in productData.products.slice(0, 10)" :key="index" @click="jumpProductDetail(item)">
           <div class="product-list-item">
           <div class="product-list-img">

components/canvasShow/basics/group/app/index.vue

@@ -13,7 +13,7 @@
          <a v-show="componentContent.showMore" class="btn-all a-link" @click="jumpGroupWorks(productData)">更多<i class="iconfont icon-arrow-right"></i></a>
        </div>
        <div>
-       <swiper class="swiper pro-box" :indicator-dots="false" :autoplay="true" :display-multiple-items="3" @change="swiperChange">
+       <swiper class="swiper pro-box" :circular="true" :indicator-dots="false" :autoplay="true" :display-multiple-items="3" @change="swiperChange">
          <swiper-item class="swiper-slide pro-item-warp" v-for="(item,index) in productData.products" :key="index" @click="jumpProductDetail(item)">
           <div class="pro-item-inner">
             <div class="pro-item">
@@ -31,8 +31,10 @@
             </div>
           </div>
          </swiper-item>
+         <!-- #ifdef MP-WEIXIN -->
          <swiper-item v-if="productData.products.length" class="swiper-slide pro-item-warp" v-for="item in (3 - productData.products.length)">
          </swiper-item>
+         <!-- #endif -->
        </swiper>
          <view class="swiper-dots" v-if="productData.products && productData.products.length > 3">
            <text class="dot" :class="index - swiperCurrent <= 2 && index - swiperCurrent >=0  && 'dot-active'" v-for="(dot, index) in productData.products.length"
@@ -80,6 +82,7 @@ export default {
       padding: 40upx 0 25upx 20upx;
       .title-img{
         width: 189upx;
+          height: 34rpx;
       }
       .btn-all{
         position: absolute;

components/canvasShow/basics/newProduct/app/index.vue

@@ -19,12 +19,12 @@
                 <img class="iconImg" v-if="item.activityType == 8" src="../../../static/images/memberCenterIcon.png">
                 <!-- #endif -->
                 <!-- #ifdef H5 || APP-PLUS -->
-                <image class="iconImg" v-if="item.activityType == 1" src="../../../static/images/groupBuyIcon.png">
-                <image class="iconImg" v-if="item.activityType == 2" src="../../../static/images/spikeIcon.png">
-                <image class="iconImg" v-if="item.activityType == 4" src="../../../static/images/spikeIcon.png">
-                <image class="iconImg" v-if="item.activityType == 3" src="../../../static/images/discountListIcon.png">
-                <image class="iconImg" v-if="item.activityType == 5" src="../../../static/images/discountListIcon.png">
-                <image class="iconImg" v-if="item.activityType == 8" src="../../../static/images/memberCenterIcon.png">
+                <image class="iconImg" v-if="item.activityType == 1" src="../../../static/images/groupBuyIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 2" src="../../../static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 4" src="../../../static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 3" src="../../../static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 5" src="../../../static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 8" src="../../../static/images/memberCenterIcon.png"></image>
                 <!-- #endif -->
                 <div class="price">
                   ¥ {{item.price}}

components/canvasShow/basics/notice.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="notice-list" :class="'terminal'+terminal" :style="{backgroundColor:componentContent.bgColor}">
-    <swiper class="swiper-wrapper" :indicator-dots="false" :autoplay="true" :vertical="true">
+    <swiper class="swiper-wrapper" :circular="true" :indicator-dots="false" :autoplay="true" :vertical="true">
       <swiper-item class="swiper-slide" v-for="(item,index) in noticesList" :key="index">
         <div class="a-link" @click="jumpNoticeDetail(item)" :style="{color:componentContent.titColor}"><span>{{item.noticeTitle}}</span></div>
       </swiper-item>
@@ -53,6 +53,7 @@ export default {
 .notice-list{
   height: 60upx;
   line-height: 60upx;
+  overflow: hidden;
   .a-link{
     // display: block;
     cursor: pointer;

components/canvasShow/basics/product/app/index.vue

@@ -9,7 +9,7 @@
       <!-- #endif -->
     </div>
     <div v-if="componentContent.arrangeType == '横向滑动' && productData.length > 2" class="product-list">
-      <swiper ref="mySwiper" class="swiper product-list-box" :indicator-dots="false" :autoplay="true" :display-multiple-items="2" @change="swiperChange">
+      <swiper ref="mySwiper" class="swiper product-list-box" :circular="true" :indicator-dots="false" :autoplay="true" :display-multiple-items="2" @change="swiperChange">
         <swiper-item class="product-list-item-warp" v-for="(item,index) in productData" :key="index" @click="jumpProductDetail(item)">
           <div class="product-list-item">
             <div class="product-list-img">

components/canvasShow/basics/vip/app/index.vue

@@ -12,11 +12,11 @@
       </div>
       <div>
         <div v-if="productData.length > 2">
-          <swiper class="swiper vip-list" :indicator-dots="false" :autoplay="true" @change="swiperChange">
+          <swiper class="swiper vip-list" :circular="true" :indicator-dots="false" :autoplay="true" @change="swiperChange">
             <swiper-item class="vip-item-warp" v-for="(itemJ,indexJ) in listTemp" :key="indexJ">
               <div class="vip-item"  v-for="(item,index) in itemJ" :key="index"  @click="jumpProductDetail(item)">
                 <div class="vip-item-img">
-                  <image v-show="item.image" class="img" :src="item.image">
+                  <image v-show="item.image" class="img" :src="item.image"></image>
                 </div>
                 <div class="vip-item-info">
                   <h3 class="name">

components/goodsDetalils/coupon-popup.vue

@@ -116,6 +116,10 @@ export default {
             default: ()=>[]
         },
         setTop: {
+          type: Number,
+          default: 0,
+        },
+        currentActive: {
           type: Number,
           default: 0
         }
@@ -124,7 +128,7 @@ export default {
         return {
             showActivity: false,
             isShowSuccess: false,
-            activeTypeFlag: 0,
+            activeTypeFlag: this.currentActive,
             activeTypeList: [{
                 name: '平台活动'
             }, {

components/wx/wxSendCoupon.vue

@@ -129,8 +129,13 @@
                                 // 领取优惠卷
                                 NET.request(API.takeBatchCoupon, params, 'POST').then(res => {
                                     if (res.code === '200') {
+                                      uni.showToast({
+                                        title:'领取成功',
+                                      })
                                         this.$emit('success')
-                                        this.$emit('closeAd')
+                                        if(!this.cParams){
+                                            this.$emit('closeAd')
+                                        }
                                     }
                                 }).catch(res => {
                                     if(res.data.code !== '200'){
@@ -261,6 +266,7 @@
             // 用户确认领券事件
             userconfirm(e){
                 console.log('用户确认领券', e)
+                this.$emit('closeAd')
             }
         }
     }

config/api.js

@@ -1,8 +1,9 @@
-// const DOMAIN_PREFIX = 'http://localhost:9007'
+// const DOMAIN_PREFIX = 'http://itxzz.top'
 const DOMAIN_PREFIX = 'https://ceres.zkthink.com'
 // https://ceresdev.zkthink.com
 // #ifndef H5
 const WX_API_BASE = DOMAIN_PREFIX + '/api' // app
+// const WX_API_BASE = DOMAIN_PREFIX  // app
 // const WX_API_BASE = 'http://3j073r3905.qicp.vip:29544'
 // #endif
 
@@ -90,6 +91,8 @@ module.exports = {
 	GetShopBanner: WX_API_BASE + '/shop/getShopBanner', //  查询店铺banner
 	getShopIndex: WX_API_BASE + '/shop/getIndex', // 查询店铺首页
 	AddBusinessBuyerUser: WX_API_BASE + '/shop/addBusinessBuyerUser', // 成为商家的客户
+	getShopSeckillIndex: WX_API_BASE + '/seckill/getIndex', // 查询店铺秒杀
+	// http://127.0.0.1:9007/seckill/getIndex?shopSeckillId=78&page=1&pageSize=10
 
 	//用户银行卡相关接口
 	QueryBankcardList: WX_API_BASE + '/bank/getAll', //  查询用户所有银行卡
@@ -108,6 +111,7 @@ module.exports = {
 	ShippingTrace: WX_API_BASE + '/order/getDilevery', //  物流信息查询
 	payOrder: WX_API_BASE + '/order/pay', //  支付成功业务处理接口
 	gotoPay: WX_API_BASE + '/order/gotoPay', //  小程序支付
+	paySuccess: WX_API_BASE + 'order/paySuccess', //  小程序支付成功
 	gotoAppPay: WX_API_BASE + '/order/gotoAppPay', //  APP立即支付
 	gotoH5Pay: WX_API_BASE + '/order/gotoH5Pay', //  H5支付
 	ConfirmReceive: WX_API_BASE + '/order/confirm', //  确认收货
@@ -215,6 +219,7 @@ module.exports = {
 
 	// 会员专区
 	getMemberProducts: WX_API_BASE + '/canvas/getMemberProducts', //查询会员商品数据
+	memberList: WX_API_BASE + '/member/getAllMemberLevelInfo', //查询会员所有等级
 
 	// 会员中心
 	getMemberShipList: WX_API_BASE + '/member/getMemberShipList', //会员权益查询

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "cereshop",
-    "appid" : "__UNI__FF9597B",
+    "appid" : "__UNI__B79F1D2",
     "description" : "cereshop",
-    "versionName" : "1.5.0",
-    "versionCode" : 150,
+    "versionName" : "1.6.0",
+    "versionCode" : 160,
     "transformPx" : false,
     "app-plus" : {
         "kernel" : {
@@ -18,9 +18,7 @@
         /* 5+App特有相关 */
         "modules" : {
             "Webview-x5" : {},
-            "VideoPlayer" : {},
-            "Share" : {},
-            "Payment" : {}
+            "VideoPlayer" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -38,7 +36,6 @@
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",

pages/tabbar/cart/index.vue

@@ -588,7 +588,7 @@ export default {
 					let item = this.dataList[i].skus[j]
 					this.allNum += item.number
 					if (item.selected == 1) {
-						this.checkNum++
+						this.checkNum = this.checkNum + item.number
 						this.checkMoney += parseFloat(item.price * item.number)
 					} else {
 						if (this.isAllCheck) {
@@ -1290,15 +1290,16 @@ export default {
 
 		.cart-bottom-box-h5 {
 			position: fixed;
-			bottom: 90rpx;
+			bottom: 74rpx;
 			width: 100%;
-      z-index: 99;
+            z-index: 99;
 		}
 
 		.cart-bottom-box-app {
 			position: fixed;
 			bottom: 0rpx;
 			width: 100%;
+			z-index: 99;
 		}
 
 		.cart-bottom {

pages/tabbar/category/index.vue

@@ -87,6 +87,7 @@
 			},
 			//一级分类点击
 			tabtap(item,index){
+        this.ifEmpty = false
 				if(this.currentIndex == index){
 					return;
 				}

pages/tabbar/index/index.vue

@@ -59,12 +59,14 @@
 			}
 		},
 		onShow() {
-            // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+      // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
       let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
       this.topHeight = menuButtonInfo.top + 10
       this.height = menuButtonInfo.height
-            // #endif
-            this.$refs.adWindow.getAd()
+      // #endif
+      this.$nextTick(() => {
+        this.$refs.adWindow.getAd()
+      })
     },
 		onPageScroll(e) {
 			this.topLeft = e.scrollTop

pages/tabbar/user/index.vue

@@ -28,7 +28,7 @@
 					</view>
 				</view>
 				<view class="notice" @click="toMessage">
-					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>
+					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead > 99 ? '99+' : useritem.notRead}}</view>
 				</view>
 			</view>
 			<view class="order-box">

pages_category_page1/coupon/list.vue

@@ -101,6 +101,7 @@ export default {
     },
     success(){
       this.page = 1
+      this.couponList = []
       this.getCouponList()
     }
   }

pages_category_page1/coupon/product.vue

@@ -41,7 +41,10 @@ export default {
       page: 1,
       pageSize: 10,
       loadingType: 0,
-      currentCoupon: {},
+      currentCoupon: {
+		  fullMoney:0,
+		  reduceMoney:0
+	  },
       cid: 0,
       ifEmpty: false
     }

pages_category_page1/discount/groupBuy.vue

@@ -102,6 +102,9 @@ export default {
 			this.shopId = 0
 			this.shopGroupWorkId = 0
 		}
+		
+	},
+	onShow() {
 		this.getGroupBuylist()
 	},
 	onReachBottom(){
@@ -178,6 +181,7 @@ export default {
 		},
 		getGroupBuylist(){
       uni.showLoading({
+        mask: true,
         title: '加载中...',
       })
       let param = {

pages_category_page1/discount/platformDiscount.vue

@@ -115,8 +115,11 @@ export default {
 		// }
     console.log(options.discountId, 'discountId---')
     this.discountId = options.discountId
-    this.getDiscountInfo()
-		this.getDiscountList()
+    
+	},
+	onShow() {
+		this.getDiscountInfo()
+			this.getDiscountList()
 	},
 	onReachBottom(){
 		if(this.loadingType == 1){

pages_category_page1/discount/spikeList.vue

@@ -1,501 +1,592 @@
 <template>
-  <view class="spikeListBox">
-    <view class="spikeBg">
-      <image src="https://ceres.zkthink.com/static/images/spikelLogo.png"></image>
-    </view>
-    <view class="tabs-nav-warp spikeNav">
-      <scroll-view class="tabs-nav" scroll-x="true">
-        <view class="ul">
-          <view class="li" v-for="(item, index) in querySessionData" :key="index" :class="{active: index === active}" @click="changeTit(index, item)">
-            <view class="timeItem">
-              <view class="date" :class="{endCls: currentTime > item.endTime}">{{item.startTime}}</view>
-              <view class="state fs24" v-if="currentTime > item.timestamp">抢购中</view>
-              <view class="state" v-if="currentTime < item.timestamp">即将开始</view>
-              <view class="state" v-if="currentTime > item.endTime">已结束</view>
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-    <view class="spikeList mar-top-20">
-      <view class="listItem" v-for="(item,index) in spikeLikeList" :key="index">
-        <view class="itemBox">
-          <img :src="item.productImage">
-        </view>
-        <view class="itemInfo">
-          <p>{{item.productName}}</p>
-          <view class="number">限量件 {{item.total}} / 剩余{{item.total - item.saleNumber}}件</view>
-          <view class="originalPrice">原价: ¥{{item.originalPrice}}</view>
-          <view class="price">
-            <view class="currentPrice flex-items font-color-FF7800">
-				<view class="iconBox flex-items">
-          <image src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
-        </view>
-				<view class="flex-row-plus flex-items priceInfo">
-					<label class="fs24">￥</label>
-					<label class="fs36">{{item.price}}</label>
+	<view class="spikeListBox">
+		<view class="spikeBg">
+			<image src="https://ceres.zkthink.com/static/images/spikelLogo.png"></image>
+		</view>
+		<view class="tabs-nav-warp spikeNav">
+			<scroll-view class="tabs-nav" scroll-x="true">
+				<view class="ul">
+					<view class="li" v-for="(item, index) in querySessionData" :key="index"
+						:class="{active: index === active}" @click="changeTit(index, item)">
+						<view class="timeItem">
+							<view class="date" :class="{endCls: currentTime > item.endTime}">{{item.startTime}}</view>
+							<view class="state fs24" v-if="currentTime > item.timestamp">抢购中</view>
+							<view class="state" v-if="currentTime < item.timestamp">即将开始</view>
+							<view class="state" v-if="currentTime > item.endTime">已结束</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="spikeList mar-top-20">
+			<view class="listItem" v-for="(item,index) in spikeLikeList" :key="index">
+				<view class="itemBox">
+					<img :src="item.productImage || item.image">
+				</view>
+				<view class="itemInfo">
+					<p>{{item.productName}}</p>
+					<view v-if="shopId" class="number">限量件 {{item.limitStockNumber}} / 剩余{{item.stockNumber}}件</view>
+					<view v-else class="number">限量件 {{item.total}} / 剩余{{item.total - item.saleNumber}}件</view>
+					<view class="originalPrice">原价: ¥{{item.originalPrice}}</view>
+					<view class="price">
+						<view class="currentPrice flex-items font-color-FF7800">
+							<view class="iconBox flex-items">
+								<image src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
+							</view>
+							<view class="flex-row-plus flex-items priceInfo">
+								<label class="fs24">￥</label>
+								<label class="fs36">{{item.price}}</label>
+							</view>
+						</view>
+						<view class="snapUpBtn" v-if="currentTime > timestamp"
+							@click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
+							<view class="btnText">去抢购</view>
+							<view class="progressBox">
+								<progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)"
+									active stroke-width="5" />
+							</view>
+						</view>
+						<view class="snapUpBtn" :class="{btnStyle1: currentTime < timestamp}"
+							v-if="currentTime < timestamp">
+							<view class="btnText">即将开始</view>
+							<view class="progressBox">
+								<progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)"
+									active stroke-width="5" />
+							</view>
+						</view>
+						<view class="snapUpBtn" :class="{btnStyle2: currentTime > endTime}"
+							v-if="currentTime > endTime">
+							<view class="btnText">已结束</view>
+							<view class="progressBox">
+								<progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)"
+									active stroke-width="5" />
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-            <view class="snapUpBtn" v-if="currentTime > timestamp" @click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
-              <view class="btnText">去抢购</view>
-              <view class="progressBox">
-                <progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)" active stroke-width="5" />
-              </view>
-            </view>
-            <view class="snapUpBtn" :class="{btnStyle1: currentTime < timestamp}" v-if="currentTime < timestamp">
-              <view class="btnText">即将开始</view>
-              <view class="progressBox">
-                <progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)" active stroke-width="5" />
-              </view>
-            </view>
-            <view class="snapUpBtn" :class="{btnStyle2: currentTime > endTime}" v-if="currentTime > endTime">
-              <view class="btnText">已结束</view>
-              <view class="progressBox">
-                <progress activeColor="#FFFFFF" :percent="getPercent(item.saleNumber, item.total)" active stroke-width="5" />
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+		</view>
+	</view>
 </template>
 
 <script>
-const NET = require('../../utils/request')
-const API = require('../../config/api')
-export default {
-	data(){
-		return{
-			spikeLikeList:[],
-			spikeLikeData:{},
-			page:1,
-			pageSize:10,
-			loadingType:0,
-			hou: "00",
-			min: "00",
-			sec: "00",
-			timeOut:undefined,
-			shopId:0,
-			shopSeckillId:0,
-			type:1,//价格
-			volume:1,//销量
-			shopShowType:false,
-			selectIndex:0,
-      list: [],
-      classList: [],
-      size: 10,
-      nothing: false,
-      changeType: 0,
-      querySessionData: [],
-      sessionPage: 1,
-      sessionPageSize: 10,
-      session: '',
-      listData: [],
-      currentTime: '',
-      active: 0,
-      timestamp: null,
-      endTime: null
-		}
-	},
-	onLoad(options) {
-    this.currentTime = new Date().getTime();
-    console.log(this.currentTime, 'current')
-		if(options.shopId && options.shopSeckillId){
-			this.shopShowType = false
-			this.shopId = options.shopId
-			this.shopSeckillId = options.shopSeckillId
-		}else{
-			this.shopShowType = true
-			this.shopId = 0
-			this.shopSeckillId = 0
-		}
-    this.getQuerySession()
-	},
-  tabChange(key, value) {
-    this.activeTab = key
-    this.changeType = value
-    this.page = 0
-    if (key !== 'index') {
-      this.classifyId = key === 'All' ? '' : key
-      this.list = []
-    }
-  },
-	onReachBottom(){
-		if(this.loadingType == 1){
-			uni.stopPullDownRefresh()
-		}else{
-			this.page = this.page+1
-			this.getSpikeLike()
-		}
-	},
-	methods:{
-    changeTit(index, item) {
-      if (this.active === index) {
-        return false
-      } else {
-        this.active = index
-        this.page = 1
-        this.pageSize = 10
-        this.session = item.time.substring(0, 16)
-        this.spikeLikeList = []
-        this.getSpikeLike()
-        this.timestamp = item.timestamp
-        this.endTime = item.endTime
-      }
-    },
-    queryProductListBySession () {
-      NET.request(API.querySession,{
-        page: this.sessionPage,
-        pageSize: this.sessionPage,
-        session: this.session
-      },'POST').then(res => {
-        this.listData = res.data
-      }).catch(res => {
-        uni.showToast({
-          title:'失败',
-          icon:"none"
-        })
-      })
-    },
-    getQuerySession () {
-      NET.request(API.querySession,{},'GET').then(res => {
-        let arr = []
-        arr = res.data
-        arr.forEach(item => {
-          let obj = {}
-          obj["time"] = item
-          let date = new Date(this.getCaption(item, 0).replace(/-/g, '/'))
-          let endDate = new Date(this.getCaption(item, 1).replace(/-/g, '/'))
-          console.log(date, 'date121212121')
-          obj["timestamp"] = date.getTime()
-          obj["endTime"] = endDate.getTime()
-          obj["startTime"] = item.substring(5, 16)
-          console.log(obj)
-          this.querySessionData.push(obj)
-        })
-        console.log(this.querySessionData, 'data')
-        this.session = this.querySessionData[0].time.substring(0, 16)
-        this.timestamp = this.querySessionData[0].timestamp
-        this.endTime = this.querySessionData[0].endTime
-        this.getSpikeLike()
-      }).catch(res => {
-        uni.showToast({
-          title:'失败1111',
-          icon:"none"
-        })
-      })
-    },
-    getCaption(obj,state) {
-      var index=obj.lastIndexOf("\|");
-      if(state==0){
-        obj=obj.substring(0,index);
-      } else {
-        obj=obj.substring(index+1,obj.length);
-      }
-      return obj;
-      },
-		gogoodsDetails(shopId,productId,skuId){
-			uni.navigateTo({
-				url:'../goodsModule/goodsDetails?shopId='+shopId + '&productId='+productId +'&skuId='+skuId
-			})
+	const NET = require('../../utils/request')
+	const API = require('../../config/api')
+	export default {
+		data() {
+			return {
+				spikeLikeList: [],
+				spikeLikeData: {},
+				page: 1,
+				pageSize: 10,
+				loadingType: 0,
+				hou: "00",
+				min: "00",
+				sec: "00",
+				timeOut: undefined,
+				shopId: 0,
+				shopSeckillId: 0,
+				type: 1, //价格
+				volume: 1, //销量
+				shopShowType: false,
+				selectIndex: 0,
+				list: [],
+				classList: [],
+				size: 10,
+				nothing: false,
+				changeType: 0,
+				querySessionData: [],
+				sessionPage: 1,
+				sessionPageSize: 10,
+				session: '',
+				listData: [],
+				currentTime: '',
+				active: 0,
+				timestamp: null,
+				endTime: null
+			}
+		},
+		onLoad(options) {
+			console.log(options,'options有没有999')
+			this.currentTime = new Date().getTime();
+			console.log(this.currentTime, 'current')
+			if (options.shopId && options.shopSeckillId) {
+				this.shopShowType = false
+				this.shopId = options.shopId
+				this.shopSeckillId = options.shopSeckillId
+			} else {
+				this.shopShowType = true
+				this.shopId = 0
+				this.shopSeckillId = 0
+			}
+			// this.getQuerySession()
 		},
-    getPercent(num, total){
-      num = parseFloat(num);
-      total = parseFloat(total);
-      if (isNaN(num) || isNaN(total)) {
-        return "-";
-      }
-      return total <= 0? "0%" : Math.round((num / total) * 10000) / 100.0;
-    },
-		getSpikeLike(){
-      uni.showLoading({
-        mask: true,
-        title: 'Loading...',
-      })
-			let param = ''
-      param = {
-        page:this.page,
-        pageSize:this.pageSize,
-        session: this.session
-      }
-			NET.request(API.queryProductListBySession,param,'POST').then(res => {
-        uni.hideLoading()
-				this.spikeLikeData = res.data
-				// if(this.shopShowType == false){
-				// 	this.dateformat(this.spikeLikeData.time)
-				// 	this.countDown()
-				// }
-				if(res.data.list.length === 0){
-					this.loadingType = 1
-					this.page = this.page
-				}else{
-					this.spikeLikeList = this.spikeLikeList.concat(res.data.list)
-          console.log(this.spikeLikeList, 'list')
+		onShow() {
+			this.getQuerySession()
+		},
+		tabChange(key, value) {
+			this.activeTab = key
+			this.changeType = value
+			this.page = 0
+			if (key !== 'index') {
+				this.classifyId = key === 'All' ? '' : key
+				this.list = []
+			}
+		},
+		onReachBottom() {
+			if (this.loadingType == 1) {
+				uni.stopPullDownRefresh()
+			} else {
+				this.page = this.page + 1
+				this.getSpikeLike()
+			}
+		},
+		methods: {
+			changeTit(index, item) {
+				if (this.active === index) {
+					return false
+				} else {
+					this.active = index
+					this.page = 1
+					this.pageSize = 10
+					this.session = item.time.substring(0, 16)
+					this.spikeLikeList = []
+					this.getSpikeLike()
+					this.timestamp = item.timestamp
+					this.endTime = item.endTime
+				}
+			},
+			queryProductListBySession() {
+				NET.request(API.querySession, {
+					page: this.sessionPage,
+					pageSize: this.sessionPage,
+					session: this.session
+				}, 'POST').then(res => {
+					this.listData = res.data
+				}).catch(res => {
+					uni.showToast({
+						title: '失败',
+						icon: "none"
+					})
+				})
+			},
+			getQuerySession() {
+				NET.request(API.querySession, {}, 'GET').then(res => {
+					let arr = []
+					arr = res.data
+					arr.forEach(item => {
+						let obj = {}
+						obj["time"] = item
+						let date = new Date(this.getCaption(item, 0).replace(/-/g, '/'))
+						let endDate = new Date(this.getCaption(item, 1).replace(/-/g, '/'))
+						console.log(date, 'date121212121')
+						obj["timestamp"] = date.getTime()
+						obj["endTime"] = endDate.getTime()
+						obj["startTime"] = item.substring(5, 16)
+						console.log(obj)
+						this.querySessionData.push(obj)
+					})
+					console.log(this.querySessionData, 'data')
+					this.session = this.querySessionData[0].time.substring(0, 16)
+					this.timestamp = this.querySessionData[0].timestamp
+					this.endTime = this.querySessionData[0].endTime
+					if(this.shopSeckillId){
+						this.getShopSeckillList()
+					}else{
+						this.getSpikeLike()
+					}
+					
+				}).catch(res => {
+					uni.showToast({
+						title: '失败1111',
+						icon: "none"
+					})
+				})
+			},
+			getCaption(obj, state) {
+				var index = obj.lastIndexOf("\|");
+				if (state == 0) {
+					obj = obj.substring(0, index);
+				} else {
+					obj = obj.substring(index + 1, obj.length);
+				}
+				return obj;
+			},
+			gogoodsDetails(shopId, productId, skuId) {
+				uni.navigateTo({
+					url: '../goodsModule/goodsDetails?shopId=' + shopId + '&productId=' + productId + '&skuId=' +
+						skuId
+				})
+			},
+			getPercent(num, total) {
+				num = parseFloat(num);
+				total = parseFloat(total);
+				if (isNaN(num) || isNaN(total)) {
+					return "-";
 				}
-			}).catch(res => {
-				uni.showToast({
-					title:'失败',
-					icon:"none"
+				return total <= 0 ? "0%" : Math.round((num / total) * 10000) / 100.0;
+			},
+			// 获取首页更多秒杀
+			getSpikeLike() {
+				uni.showLoading({
+					mask: true,
+					title: 'Loading...',
+				})
+				let param = ''
+				param = {
+					page: this.page,
+					pageSize: this.pageSize,
+					session: this.session
+				}
+				NET.request(API.queryProductListBySession, param, 'POST').then(res => {
+					uni.hideLoading()
+					this.spikeLikeData = res.data
+					// if(this.shopShowType == false){
+					// 	this.dateformat(this.spikeLikeData.time)
+					// 	this.countDown()
+					// }
+					if (res.data.list.length === 0) {
+						this.loadingType = 1
+						this.page = this.page
+					} else {
+						this.spikeLikeList = this.spikeLikeList.concat(res.data.list)
+						console.log(this.spikeLikeList, 'list')
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: '失败',
+						icon: "none"
+					})
+				})
+			},
+			// 获取店铺更多秒杀
+			getShopSeckillList(){
+				uni.showLoading({
+					mask: true,
+					title: 'Loading...',
 				})
-			})
+				let param = ''
+				param = {
+					page: this.page,
+					pageSize: this.pageSize,
+					shopSeckillId: this.shopSeckillId,
+				}
+				NET.request(API.getShopSeckillIndex, param, 'GET').then(res => {
+					uni.hideLoading()
+					this.spikeLikeData = res.data
+					if (res.data.page.list.length === 0) {
+						this.loadingType = 1
+						this.page = this.page
+					} else {
+						this.spikeLikeList = this.spikeLikeList.concat(res.data.page.list)
+						console.log(this.spikeLikeList, 'classifies')
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: '失败',
+						icon: "none"
+					})
+				})
+			}
 		}
 	}
-}
 </script>
 <style>
-page {
-  background: #333333;
-}
+	page {
+		background: #333333;
+	}
 </style>
 <style lang="scss" scoped>
-page {
-  background: #333333;
-}
-  .spikeListBox {
-    padding: 20rpx;
-    .spikeBg {
-      text-align: center;
-      margin: 50rpx auto;
-      image {
-        width: 262rpx;
-        height: 52rpx;
-      }
-    }
-	  .selected{
-	  	color: #FE6F52;
-	  }
-	  .shopShowTypebox{
-		  height: 80rpx;
-		  background-color: #FFFFFF;
-		  z-index: 9999;
-	  }
-    .countdown {
-      display: flex;
-      justify-content: center;
-      height: 80upx;
-      align-items: center;
-      background: #F7F7F7;
-      width: 100%;
-      z-index: 999;
-      .endDate {
-        display: flex;
-        align-items: center;
-        margin-left: 20upx;
-        span {
-          min-width: 48upx;
-          height: 36upx;
-          padding: 0upx 8upx;
-          background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
-          box-shadow: 0rpx 6rpx 12rpx rgba(233, 0, 0, 0.3);
-          display: block;
-          font-size: 28rpx;
-          color: #FFFFFF;
-          text-align: center;
-        }
-        // #ifdef MP-ALIPAY
-        span {
-          height: min-48upx;
-        }
-        // #endif
-        i {
-          font-size: 28upx;
-          color: #FF736C;
-          font-style: normal;
-          margin: 0 8upx;
-        }
-      }
-    }
-    .spikeList {
-      .listItem {
-        display: flex;
-        padding: 20upx;
-        margin-bottom: 20upx;
-        background: #FFFFFF;
-        &:last-child {
-          border-bottom: none;
-        }
-        .itemBox {
-          width: 260upx;
-          height: 260upx;
-          margin-right: 30upx;
-          img {
-            width: 100%;
-            height: 100%;
-          }
-        }
-        .itemInfo {
-          flex: 1;
-          .iconBox {
-            image {
-              width: 58rpx;
-              height: 36rpx;
-            }
-          }
-          p {
-            font-size: 26upx;
-            color: #333333;
-            line-height: 35upx;
-            height: 70rpx;
-            margin-bottom: 20upx;
-            text-overflow: -o-ellipsis-lastline;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 2;
-            line-clamp: 2;
-            -webkit-box-orient: vertical;
-          }
-          .number {
-            color: #C5AA7B;
-            font-size: 26rpx;
-            height: 40rpx;
-            background: #FFFFFF;
-            border: 2rpx solid #E4E5E6;
-            font-weight: 400;
-            display: inline;
-            padding: 0 5rpx;
-          }
-          .originalPrice {
-            font-size: 24upx;
-            margin-top: 20upx;
-            text-decoration: line-through;
-            color: #CCCCCC;
-          }
-          .price {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .priceInfo {
-              font-size: 40rpx;
-              color: #C83732;
-            }
-            .snapUpBtn {
-              width: 160upx;
-              height: 84upx;
-              text-align: center;
-              background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
-              box-shadow: 0rpx 6rpx 12rpx rgba(233, 0, 0, 0.3);
-              opacity: 1;
-              border-radius: 10rpx;
-              .progressBox {
-                width: 82%;
-                margin: 0 auto;
-                border-radius: 10rpx;
-                overflow: hidden
-              }
-              .btnText {
-                color: #FFFFFF;
-                font-weight: 400;
-                opacity: 0.5;
-                margin: 10rpx 0;
-              }
-              .uni-progress {
-                border-radius: 10rpx;
-              }
-            }
-            .btnStyle1 {
-              background: linear-gradient(90deg, #29C790 0%, #75D98C 100%);
-              box-shadow: 0 6rpx 12rpx rgba(52, 203, 144, 0.3);
-            }
-            .btnStyle2 {
-              background: #999999;
-              .btnText {
-                opacity: 0.8;
-              }
-            }
-          }
-        }
-      }
-    }
-    .filterBox {
-      display: flex;
-      height: 80upx;
-      align-items: center;
-      width: 100%;
-      background: #FFFFFF;
-      left: 0;
-      .item {
-        flex: 0 0 33.33%;
-        text-align: center;
-      }
-    }
-    .tabs-nav {
-      margin-top: 20rpx;
-      .ul {
-        white-space: nowrap;
-        .li {
-          display: inline-block;
-          margin-left: 60rpx;
-          font-size: 32rpx;
-          color: #9499a8;
-          position: relative;
-          padding-bottom: 18rpx;
-          .timeItem {
-            text-align: center;
-            .date {
-              font-size: 24rpx;
-              color: #FFFFFF;
-              width: 140rpx;
-              white-space: normal;
-            }
-            .state {
-              font-size: 24rpx;
-              color: #999999;
-              display: inline-block;
-            }
-            .endCls {
-              color: #999999;
-            }
-          }
-          //&.on {
-          //  color: #FFFFFF;
-          //  &:after {
-          //    content: '';
-          //    width: 100%;
-          //    height: 4rpx;
-          //    position: absolute;
-          //    left: 0;
-          //    bottom: 0;
-          //    background: #0F6AFB;
-          //  }
-          //  font-weight:bold;
-          //}
-        }
-        .active {
-          .timeItem {
-            .date {
-              color: #C83732;
-              width: 140rpx;
-              white-space: normal;
-            }
-            .state {
-              display: inline-block;
-              padding: 0 10rpx;
-              color: #FFFFFF;
-              background: #C83732;
-            }
-          }
-        }
-      }
-    }
-  }
+	page {
+		background: #333333;
+	}
+
+	.spikeListBox {
+		padding: 20rpx;
+
+		.spikeBg {
+			text-align: center;
+			margin: 50rpx auto;
+
+			image {
+				width: 262rpx;
+				height: 52rpx;
+			}
+		}
+
+		.selected {
+			color: #FE6F52;
+		}
+
+		.shopShowTypebox {
+			height: 80rpx;
+			background-color: #FFFFFF;
+			z-index: 9999;
+		}
+
+		.countdown {
+			display: flex;
+			justify-content: center;
+			height: 80upx;
+			align-items: center;
+			background: #F7F7F7;
+			width: 100%;
+			z-index: 999;
+
+			.endDate {
+				display: flex;
+				align-items: center;
+				margin-left: 20upx;
+
+				span {
+					min-width: 48upx;
+					height: 36upx;
+					padding: 0upx 8upx;
+					background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
+					box-shadow: 0rpx 6rpx 12rpx rgba(233, 0, 0, 0.3);
+					display: block;
+					font-size: 28rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+
+				// #ifdef MP-ALIPAY
+				span {
+					height: min-48upx;
+				}
+
+				// #endif
+				i {
+					font-size: 28upx;
+					color: #FF736C;
+					font-style: normal;
+					margin: 0 8upx;
+				}
+			}
+		}
+
+		.spikeList {
+			.listItem {
+				display: flex;
+				padding: 20upx;
+				margin-bottom: 20upx;
+				background: #FFFFFF;
+
+				&:last-child {
+					border-bottom: none;
+				}
+
+				.itemBox {
+					width: 260upx;
+					height: 260upx;
+					margin-right: 30upx;
+
+					img {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.itemInfo {
+					flex: 1;
+
+					.iconBox {
+						image {
+							width: 58rpx;
+							height: 36rpx;
+						}
+					}
+
+					p {
+						font-size: 26upx;
+						color: #333333;
+						line-height: 35upx;
+						height: 70rpx;
+						margin-bottom: 20upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+
+					.number {
+						color: #C5AA7B;
+						font-size: 26rpx;
+						height: 40rpx;
+						background: #FFFFFF;
+						border: 2rpx solid #E4E5E6;
+						font-weight: 400;
+						display: inline;
+						padding: 0 5rpx;
+					}
+
+					.originalPrice {
+						font-size: 24upx;
+						margin-top: 20upx;
+						text-decoration: line-through;
+						color: #CCCCCC;
+					}
+
+					.price {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.priceInfo {
+							font-size: 40rpx;
+							color: #C83732;
+						}
+
+						.snapUpBtn {
+							width: 160upx;
+							height: 84upx;
+							text-align: center;
+							background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
+							box-shadow: 0rpx 6rpx 12rpx rgba(233, 0, 0, 0.3);
+							opacity: 1;
+							border-radius: 10rpx;
+
+							.progressBox {
+								width: 82%;
+								margin: 0 auto;
+								border-radius: 10rpx;
+								overflow: hidden
+							}
+
+							.btnText {
+								color: #FFFFFF;
+								font-weight: 400;
+								opacity: 0.5;
+								margin: 10rpx 0;
+							}
+
+							.uni-progress {
+								border-radius: 10rpx;
+							}
+						}
+
+						.btnStyle1 {
+							background: linear-gradient(90deg, #29C790 0%, #75D98C 100%);
+							box-shadow: 0 6rpx 12rpx rgba(52, 203, 144, 0.3);
+						}
+
+						.btnStyle2 {
+							background: #999999;
+
+							.btnText {
+								opacity: 0.8;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.filterBox {
+			display: flex;
+			height: 80upx;
+			align-items: center;
+			width: 100%;
+			background: #FFFFFF;
+			left: 0;
+
+			.item {
+				flex: 0 0 33.33%;
+				text-align: center;
+			}
+		}
+
+		.tabs-nav {
+			margin-top: 20rpx;
+
+			.ul {
+				white-space: nowrap;
+
+				.li {
+					display: inline-block;
+					margin-left: 60rpx;
+					font-size: 32rpx;
+					color: #9499a8;
+					position: relative;
+					padding-bottom: 18rpx;
+
+					.timeItem {
+						text-align: center;
+
+						.date {
+							font-size: 24rpx;
+							color: #FFFFFF;
+							width: 150rpx;
+							white-space: normal;
+						}
+
+						.state {
+							font-size: 24rpx;
+							color: #999999;
+							display: inline-block;
+						}
+
+						.endCls {
+							color: #999999;
+						}
+					}
+
+					//&.on {
+					//  color: #FFFFFF;
+					//  &:after {
+					//    content: '';
+					//    width: 100%;
+					//    height: 4rpx;
+					//    position: absolute;
+					//    left: 0;
+					//    bottom: 0;
+					//    background: #0F6AFB;
+					//  }
+					//  font-weight:bold;
+					//}
+				}
+
+				.active {
+					.timeItem {
+						.date {
+							color: #C83732;
+							width: 150rpx;
+							white-space: normal;
+						}
+
+						.state {
+							display: inline-block;
+							padding: 0 10rpx;
+							color: #FFFFFF;
+							background: #C83732;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>
 <style scoped>
-  .snapUpBtn /deep/ .uni-progress-bar {
-    border-radius: 10rpx;
-    height: 8rpx;
-    background-color: #deabab !important;
-  }
-  .btnStyle1 /deep/ .uni-progress-bar {
-    background-color: #ace8c5 !important;
-  }
-  .btnStyle2 /deep/ .uni-progress-bar {
-    background-color: #cccccc !important;
-  }
-  .snapUpBtn /deep/ .uni-progress-inner-bar {
-    border-radius: 10rpx;
-  }
-  .spikeNav /deep/ .tabs-nav {
-  }
+	.snapUpBtn /deep/ .uni-progress-bar {
+		border-radius: 10rpx;
+		height: 8rpx;
+		background-color: #deabab !important;
+	}
+
+	.btnStyle1 /deep/ .uni-progress-bar {
+		background-color: #ace8c5 !important;
+	}
+
+	.btnStyle2 /deep/ .uni-progress-bar {
+		background-color: #cccccc !important;
+	}
+
+	.snapUpBtn /deep/ .uni-progress-inner-bar {
+		border-radius: 10rpx;
+	}
+
+	.spikeNav /deep/ .tabs-nav {}
 </style>

pages_category_page1/distributionModule/commodity.vue

@@ -92,6 +92,10 @@
 				})
 			},
 			fenxiang(item) {
+				// #ifdef APP-PLUS
+				var system = 1
+				// #endif
+				
 				// #ifdef H5
 				var system = 3
 				// #endif
@@ -105,7 +109,7 @@
 				// #endif
 
 				uni.showLoading({
-          mask: true,
+                  mask: true,
 				  title: '请稍候...'
 				})
 				NET.request(API.getSharePic, {

pages_category_page1/distributionModule/distributionOrder.vue

@@ -0,0 +1,140 @@
+<template>
+	<view>
+		<view v-if="FindMySalesData.total>0">
+			<view  class="flex-center clientList-box" v-for="(item, index) in FindMySalesDatalist" :key="index">
+				<view class="directAward-box font-color-656 fs26">
+					<view class="directAward-icon flex-row-plus flex-items flex-sp-between" @click="arrowTypeChange(index)">
+						<view class="flex-column-plus font-color-333 fs30">
+							<label class="orderId-box">订单号：{{item.orderId}}</label>
+							<view class="orderId-box mar-top-20">
+								佣金：<label class="font-color-C5AA7B">¥{{item.commission}}</label>
+							</view>
+						</view>
+            <view>
+             <image v-if="item.ifOpen  == false" class="arrow-down" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-16/5533f3baf2184f86b5ef88ed6c400713_arrowDownIcon.png"></image>
+              <image v-if="item.ifOpen  == true" class="arrow-down" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-16/22f5f56f53ec4f558a6268e4fef7e1f5_arrowUpIcon.png"></image>
+            </view>
+					</view>
+					<view class="upBox" v-if="item.ifOpen == true">
+						<view class="flex-row-plus flex-items mar-top-30 flex-sp-between">
+							<label class="orderId-box font-color-999 fs26">商品数：{{item.products}}</label>
+							<label class="orderId-box font-color-999 fs26">实付金额：¥{{item.price}}</label>
+						</view>
+						<view class="flex-row-plus flex-items mar-top-30 flex-sp-between">
+							<label class="orderId-box font-color-999 fs26">下单人：{{item.customerName}}</label>
+							<label class="commission-box mar-left-70 font-color-999 fs26">状态：<text class="state" :class="{current: item.state==0}">{{item.state===0?'未结算':'已结算'}}</text></label>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-else class="emptyCart-box flex-items-plus flex-column">
+			<image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/collectEmpty.png"></image>
+			<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
+		</view>
+	</view>
+</template>
+
+<script>
+	const NET = require('../../utils/request')
+	const API = require('../../config/api')
+	export default {
+		data() {
+			return {
+				shopId: 0,
+				distributorId: 0,
+				page:1,
+				pageSize:20,
+				FindMySalesData: [],
+				FindMySalesDatalist:[]
+			}
+		},
+		onLoad: function(options) {
+			this.shopId = options.shopId
+			this.distributorId = options.distributorId
+			this.getSalesOrderPage()
+		},
+		onReachBottom(){
+			if(this.loadingType == 1){
+				uni.stopPullDownRefresh()
+			}else{
+				this.page = this.page+1
+				this.getSalesOrderPage()
+			}
+		},
+		methods: {
+			getSalesOrderPage() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				NET.request(API.FindMySalesPage, {
+					shopId: this.shopId,
+					distributorId: this.distributorId,
+					page:this.page,
+					pageSize:this.pageSize,
+				}, 'GET').then(res => {
+					uni.hideLoading()
+					if(res.data.list.length == 0){
+						this.loadingType = 1
+						this.page = this.page
+					}
+					this.FindMySalesDatalist = this.FindMySalesDatalist.concat(res.data.list)
+					this.FindMySalesData = res.data
+				}).catch(res => {
+					uni.hideLoading()
+
+				})
+			},
+
+			arrowTypeChange(arrowTypeId) {
+				this.FindMySalesData.list[arrowTypeId].ifOpen = this.FindMySalesData.list[arrowTypeId].ifOpen == true ? false : true
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page {
+  background: #F8F8F8;
+}
+	.emptyCart-box{
+		margin-top: 70upx;
+    .emptyCart-img{
+         margin-top: 30%;
+         width: 198rpx;
+         height: 183rpx;
+    }
+	}
+	.directAward-box {
+		width: 95%;
+		display: flex;
+		justify-content: flex-start;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		padding: 40upx 20upx;
+		margin-top: 30upx;
+		.orderId-box {
+			width: 320upx;
+
+		}
+
+		.commission-box {
+			width: 340upx;
+		}
+    .state {
+      color: #16BB89;
+    }
+    .current {
+      color: #C83732 !important;
+    }
+		.arrow-down {
+			width: 24upx;
+			height: 24upx;
+		}
+
+		.upBox {
+			border-top: 1upx solid #EDEDED;
+			margin-top: 30upx;
+		}
+	}
+</style>

pages_category_page1/distributionModule/salesIndex.vue

@@ -167,6 +167,7 @@
 			},
 			// 分销订单
 			godistributionOrder(){
+				console.log('点击分销订单')
 				uni.navigateTo({
 					url: `distributionOrder?shopId=${this.item.shopId}&distributorId=${this.item.distributorId}`
 				});

pages_category_page1/distributionModule/shareProduct.vue

@@ -5,25 +5,21 @@
 				<view class="rect" @tap.stop>
 					<!-- 关闭按钮 -->
 					<view class="guanbiView">
-            <!-- #ifdef MP-WEIXIN -->
-            <img @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></img>
-            <!-- #endif -->
-            <!-- #ifdef H5 || APP-PLUS -->
-            <image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></image>
-            <!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
+						<img @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi"
+							style="width:30px;height:30px;" mode="widthFix"></img>
+						<!-- #endif -->
+						<!-- #ifdef H5 || APP-PLUS -->
+						<image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi"
+							style="width:30px;height:30px;" mode="widthFix"></image>
+						<!-- #endif -->
 					</view>
 					<!-- 内容 -->
 					<view class="imgBox">
-						<view
-							v-if="shareType==1"
-							class="boxInner imgBoxShop"
-							:style="{'backgroundImage':'url(' + erweima + ')'}"
-						></view>
-						<view
-							v-else
-							class="boxInner imgBoxProduct"
-							:style="{'backgroundImage':'url(' + erweima + ')'}"
-						></view>
+						<view v-if="shareType==1" class="boxInner imgBoxShop"
+							:style="{'backgroundImage':'url(' + erweima + ')'}"></view>
+						<view v-else class="boxInner imgBoxProduct" :style="{'backgroundImage':'url(' + erweima + ')'}">
+						</view>
 					</view>
 					<!-- 分享 -->
 				</view>
@@ -79,7 +75,7 @@
 				productId: null,
 				noMp: false,
 				shareType: 1,
-				isIphone:false
+				isIphone: false
 			}
 		},
 		onLoad: function(options) {
@@ -110,12 +106,42 @@
 					delta: 1
 				})
 			},
+
 			// 保存图片到本地
 			WXfenx() {
-				// #ifdef MP-WEIXIN || MP-ALIPAY
+				// #ifdef APP-PLUS || MP-WEIXIN || MP-ALIPAY 
 				uni.showLoading({
-					title:'图片保存中...'
+					title: '图片保存中...'
+				})
+				// #endif	
+				
+				// #ifdef APP-PLUS
+				uni.downloadFile({
+					url: this.erweima,
+					success: (res) => {
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath,
+								success: function() {
+									uni.hideLoading()
+									uni.showToast({
+										title: "保存成功",
+									});
+								},
+								fail: function() {
+									uni.hideLoading()
+									uni.showToast({
+										title: "保存失败",
+										icon: "none"
+									});
+								}
+							});
+						}
+					}
 				})
+				// #endif	
+				
+				// #ifdef MP-WEIXIN || MP-ALIPAY 
 				uni.getImageInfo({
 					src: this.erweima,
 					success: function(image) {
@@ -134,12 +160,18 @@
 									content: '请确认是否已开启授权',
 									confirmText: '开启授权',
 									success(res) {
-										if (res.confirm) {
+										if (res
+											.confirm
+										) {
 											uni.openSetting({
-												success(settingdata) {
-													if (settingdata.authSetting[
+												success(
+													settingdata
+												) {
+													if (settingdata
+														.authSetting[
 															"scope.writePhotosAlbum"
-														]) {
+														]
+													) {
 														uni.showToast({
 															title: '授权成功，请重试哦~',
 															icon: "none"
@@ -158,16 +190,19 @@
 							},
 						});
 					},
-					fail() {}
+					fail(err) {
+						console.log(err, 'err报错999')
+					}
 				});
 				// #endif
-				// #ifdef H5
+				// #ifdef H5 
 				var oA = document.createElement('a');
 				oA.download = ''; // 设置下载的文件名，默认是’下载’
 				oA.href = this.erweima;
 				document.body.appendChild(oA);
 				oA.click();
-				oA.remove(); // 下载之后把创建的元素删除
+				oA
+					.remove(); // 下载之后把创建的元素删除
 				// #endif
 			},
 			// 复制链接

pages_category_page1/distributionModule/totalAward.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view v-if="ifShow">
 		<view class="totalAward-topBackImg flex-items flex-column">
 			<view class="totalAward-content flex-column font-color-FFF">
 				<view class="flex-column-plus flex-items mar-top-40">
@@ -88,7 +88,6 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
 			<view v-else class="emptyCart-box flex-items-plus flex-column">
 				<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
@@ -132,7 +131,9 @@
 				loadingType:0,
 				loadingType1:0,
 				ZSalesOrderDatalist:[],
-				JSalesOrderDatalist:[]
+				JSalesOrderDatalist:[],
+        ifShow: false,
+        ifEmpty: false
 			}
 		},
 		onLoad: function(optins) {
@@ -180,6 +181,7 @@
 					this.ZSalesOrderDatalist = this.ZSalesOrderDatalist.concat(res.data.page.list)
 					this.ZSalesOrderData = res.data
 					this.ZStotallength = this.ZSalesOrderData.page.total
+          this.ifShow = true
 				}).catch(res => {
 					uni.hideLoading()
 				})

pages_category_page1/distributionModule/unliquidated.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view v-if="ifShow">
 		<view class="unliquidated-topBackImg flex-items flex-column">
 			<view class="totalAward-content flex-column font-color-FFF">
 				<view class="flex-items-plus  mar-top-60">
@@ -130,7 +130,8 @@
 				loadingType:0,
 				loadingType1:0,
 				ZSalesOrderDatalist:[],
-				JSalesOrderDatalist:[]
+				JSalesOrderDatalist:[],
+        ifShow: false
 			}
 
 		},
@@ -178,6 +179,7 @@
 					this.ZSalesOrderDatalist = this.ZSalesOrderDatalist.concat(res.data.page.list)
 					this.ZSalesOrderData = res.data
 					this.ZStotallength = this.ZSalesOrderData.page.total
+          this.ifShow = true
 				}).catch(res => {
 					uni.hideLoading()
 				})

pages_category_page1/goodsModule/answerList.vue

@@ -276,13 +276,11 @@ export default {
           }
           .answerBtn {
             width: 130upx;
-            height: 44upx;
-            line-height: 44upx;
-            background: #FFFFFF;
-            border: 1px solid #FF7800;
-            border-radius: 22upx;
+            height: 50upx;
+            line-height: 50upx;
+            background: #C5AA7B;
             text-align: center;
-            color: #C5AA7B;
+            color: #FFFFFF;
             font-size: 24upx;
           }
         }

pages_category_page1/goodsModule/goodsDetails.vue

@@ -23,6 +23,7 @@
 				</view>
 				<label class="fs24 font-color-999">{{productData.users || 0}}人付款</label>
 			</view>
+			<!-- <view v-else-if="selectedSku.activityType === 8" class="sceneMarketingBox"></view> -->
 			<view v-else class="seckill-box">
         <view class="flex-items flex-sp-between" v-if="selectedSku.activityType === 9">
           <view class="vipImg flex-items">
@@ -320,7 +321,7 @@
 				</view>
 				<view class="color-box flex-column-plus">
 					<view v-for="(attritem,index) in productData.names" :key="index">
-						<label class="fs26 font-color-333">{{attritem.skuName}}</label>
+						<label class="fs26 font-color-333" v-if="attritem.nameCode">{{attritem.skuName}}</label>
 						<view class="colorName-box">
 							<view class="pad-bot-30" v-for="(attrRes, resIndex) in attritem.values" :key="resIndex">
 								<view class="colorName"
@@ -400,6 +401,7 @@
 			:markTools="markTools"
 			:shopMarkTools="shopMarkTools"
 			:setTop="topLeft"
+      :currentActive="currentActive"
 		></coupon-popup>
 		<!-- 拼单弹框 -->
 		<u-popup class="popupDiscount" v-model="showGroupBuyList" mode="center" border-radius="14"
@@ -528,7 +530,8 @@ export default {
 			markTools: [], //平台优惠券
 			shopMarkTools: [], //店铺优惠券
       ifShow: false,
-			topLeft: 0
+			topLeft: 0,
+      currentActive: 0
 		}
 	},
 	computed:{
@@ -560,6 +563,7 @@ export default {
 			this.salesId = parseInt(item.salesId)
 			getApp().globalData.productShareItem = undefined
 		} else {
+      console.log(options, '001001')
 			this.shopId = parseInt(options.shopId)
 			this.productId = options.productId
 			this.paramSkuId = options.skuId
@@ -926,8 +930,8 @@ export default {
 		selectBySkuId(skuId) {
 			if (skuId) {
 				let mapinfo = this.productData.map
-        console.log(mapinfo,'mapinfo',skuId)
 				for (var key in mapinfo) {
+          console.log(skuId, mapinfo[key].skuId, 'test')
 					if (parseInt(mapinfo[key].skuId) === parseInt(skuId)) {
 						this.selectedSku = mapinfo[key]
 						// 选中sku对应的规格
@@ -940,8 +944,8 @@ export default {
                   let obj = {
                     skuText: ''
                   }
-                  if (attr.values[index].skuValue === '单款项') {
-                    obj.skuText = '单款项'
+                  if (attr.values[index].valueCode === '单款项') {
+                    obj.skuText = attr.values[index].skuValue
                     this.currentSuk.push(obj)
                     break
                   } else {
@@ -978,8 +982,8 @@ export default {
                   let obj = {
                     skuText: ''
                   }
-                  if (attr.values[index].skuValue === '单款项') {
-                    obj.skuText = '单款项'
+                  if (attr.values[index].valueCode === '单款项') {
+                    obj.skuText = attr.values[index].skuValue
                     this.currentSuk.push(obj)
                     break
                   } else {
@@ -1072,12 +1076,12 @@ export default {
 
 				this.markTools = res.data.markTools //平台优惠券
 				this.shopMarkTools = res.data.shopMarkTools //店铺优惠券
-				this.activeTypeFlag = this.markTools.length ===0 && this.shopMarkTools.length > 0 ? 1:0
+				this.currentActive = this.markTools.length ===0 && this.shopMarkTools.length > 0 ? 1:0
 				//如果是单款式商品，需要特殊处理productData.names
 				const mapKeys = Object.keys(this.productData.map)
 				if (mapKeys.length === 1 && mapKeys[0] === '单款项') {
 					this.productData.names[0].values.push({
-						skuValue: '单款项',
+						skuValue: this.productData.names[0].skuName,
 						valueCode: '单款项'
 					})
 				}
@@ -2618,7 +2622,12 @@ export default {
 		margin-left: 30upx;
 	}
 
-
+    .sceneMarketingBox{
+		width: 100%;
+		background: url("https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/5f85fe4782e34c10b15b04f76c571d12_sceneMarketingDetailsIcon.png"
+) no-repeat left top;
+		padding: 35rpx 30rpx;
+	}
 
 	.seckill-box {
 		width: 100%;

pages_category_page1/goodsModule/goodsList.vue

@@ -48,6 +48,7 @@
               <image class="iconImg" v-if="item.activityType == 4" src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
               <image class="iconImg" v-if="item.activityType == 3" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
               <image class="iconImg" v-if="item.activityType == 5" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
+			  <image class="iconImg" v-if="item.activityType == 8" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png"></image>
               <image class="iconImg" v-if="item.activityType == 9" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png"></image>
 							<view class="font-color-C83732 flex-row-plus">
 								<b>￥</b>
@@ -71,7 +72,7 @@
 			<label class="font-color-999 fs26 mar-top-10">换个词试试吧～</label>
 		</view>
 
-		<view class="reachBottom" v-if="topLeft > 400 && list.length > 0">
+		<view class="reachBottom" v-if="noMoreData && !ifEmpty">
 			<image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix"></image>
 			<text class="reach-text">这里到底了哦~~</text>
 		</view>
@@ -96,7 +97,9 @@
         type:1,//价格排序条件
         volume:1,//销量排序条件
 				topLeft: 0,
-        ifEmpty: false
+        ifEmpty: false,
+        noMoreData: false,
+        total: 0
 			}
 		},
 		onLoad(option) {
@@ -116,11 +119,14 @@
 				this.searchList(0)
 			}
 		},
-		onPageScroll(e) {
-			this.topLeft = e.scrollTop
-		},
+		// onPageScroll(e) {
+		// 	this.topLeft = e.scrollTop
+		// },
 		methods: {
       sortTap(index){
+        this.loadingType = 0
+        this.noMoreData = false
+        this.total = 0
         this.page = 1
         this.list = []
         if(index == 1){
@@ -141,7 +147,8 @@
 			},
 			searchList(type){
         uni.showLoading({
-				      title: '加载中...',
+          mask: true,
+          title: '加载中...',
 				})
 				if(type == 1){
 					this.list = []
@@ -158,8 +165,11 @@
 					}, 'GET').then(res => {
 						uni.hideLoading()
 						this.list = this.list.concat(res.data.list)
-            if (this.list.length === 0) {
-              this.ifEmpty = true
+            this.total = res.data.total
+			this.ifEmpty = this.list.length === 0
+            if (this.total === this.list.length) {
+              this.noMoreData = true
+              this.loadingType = 1
             }
 					}).catch(res => {
 						uni.hideLoading()
@@ -174,8 +184,11 @@
 					}, 'GET').then(res => {
 						uni.hideLoading()
 						this.list = this.list.concat(res.data.list)
-            if (this.list.length === 0) {
-              this.ifEmpty = true
+            this.total = res.data.total
+			this.ifEmpty = this.list.length === 0
+            if (this.total === this.list.length) {
+              this.noMoreData = true
+              this.loadingType = 1
             }
 					}).catch(res => {
 						uni.hideLoading()
@@ -220,6 +233,8 @@ input{padding-left: 80upx;}
     padding: 20rpx;
     background: #FFFFFF;
     border-top: 2rpx solid #F3F4F5;
+	  position: relative;
+	  z-index: 2;
   }
   .searchImg-box {
     position: relative;

pages_category_page1/goodsModule/invitePoster.vue

@@ -223,7 +223,13 @@
 					type:0
 				},
 				"GET").then(res => {
+					// #ifndef MP-WEIXIN
 					this.qrcode = res.data.qrcode
+					// #endif
+					// #ifdef MP-WEIXIN
+					this.qrcode = res.data.xcxQrcode
+					// #endif
+					console.log(this.qrcode, 'this.qrcode')
 					this.getCanvas()
 					this.loadingQrcode = false
 				}).catch(res => {

pages_category_page1/goodsModule/inviteSpell.vue

@@ -43,8 +43,6 @@
 			  <view v-if="type == 0" @click="getOffered" class="offered-but font-color-FFF flex-items-plus mar-top-60">立即参团</view>
 			  <view v-if="type == 1" @click="goinvitePoster" class="poster-but flex-items-plus mar-top-40">生成邀请海报</view>
 		  </view>
-
-
       </view>
 		</view>
 		<view class="spellrule flex-items-plus flex-column mar-top-20">
@@ -97,7 +95,7 @@
 						<label class="add" @click="numAdd">+</label>
 					</view>
 				</view>
-				<view class="goosDetailbut-box flex-items-plus" :style="{'padding-bottom':(isIphone===true? 50:20)+'upx'}">
+				<view class="goosDetailbut-box flex-items-plus" :style="{'padding-bottom':(isIphone===true? 50:20)+'rpx'}">
 					<view class="joinbuyBut" @click="getGroupSettlement(2)">确定</view>
 				</view>
 			</view>
@@ -133,7 +131,7 @@
 				min: "00",
 				sec: "00",
 				timeOut:undefined,
-				goosDetailshowFlag:false,
+				goosDetailshowFlag: false,
 				productId:0,
 				skuId:0,
 				shopGroupWorkId:0,
@@ -221,13 +219,21 @@
 		onLoad(options) {
 			console.log(options,'options')
 			this.isIphone = getApp().globalData.isIphone;
-			this.collageId = parseInt(options.collageId)
-			this.orderId = parseInt(options.orderId)
-			this.productId = parseInt(options.productId)
-			this.skuId = parseInt(options.skuId)
-			// this.type = parseInt(options.type)
-			this.shopGroupWorkId = parseInt(options.shopGroupWorkId)
-
+			let item = getApp().globalData.inviteSpellShareItem
+			if (item) {
+				this.collageId = parseInt(item.collageId)
+				this.orderId = parseInt(item.orderId)
+				this.productId = parseInt(item.productId)
+				this.skuId = parseInt(item.skuId)
+				this.shopGroupWorkId = parseInt(item.shopGroupWorkId)
+				getApp().globalData.inviteSpellShareItem = undefined
+			} else {
+				this.collageId = parseInt(options.collageId)
+				this.orderId = parseInt(options.orderId)
+				this.productId = parseInt(options.productId)
+				this.skuId = parseInt(options.skuId)
+				this.shopGroupWorkId = parseInt(options.shopGroupWorkId)
+			}
 			this.getProductSku()
 			this.queryProductDetail()
 			this.url = '/pages_category_page1/goodsModule/inviteSpell?collageId='
@@ -235,10 +241,11 @@
 		},
 		methods:{
 			getOffered(){
-
+        this.goosDetailshowFlag = true
 			},
 			//拼团下单
 			getGroupSettlement(type){
+        uni.removeStorageSync("skuItemDTOList")
 				let data={}
 				data= {
 					collageId:this.collageId,

pages_category_page1/goodsModule/putQuestions.vue

@@ -13,13 +13,13 @@
       <view class="uni-textarea">
         <textarea v-model="questionText" placeholder="请说出你的问题..." auto-height />
       </view>
-      <view class="anonymous">
-		  <view class="flex-row-plus flex-items" @click="changeCheck">
-			 <image mode="aspectFill" v-if="anonymous == true" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
-			 <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
-			 <label>匿名提问</label>
-		  </view>
-      </view>
+<!--      <view class="anonymous">-->
+<!--		  <view class="flex-row-plus flex-items" @click="changeCheck">-->
+<!--			 <image mode="aspectFill" v-if="anonymous == true" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>-->
+<!--			 <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>-->
+<!--			 <label>匿名提问</label>-->
+<!--		  </view>-->
+<!--      </view>-->
     </view>
     <view class="putQuestionsBox" @click="addProblem">
       <span class="putQuestionsBtn">发布</span>

pages_category_page1/goodsModule/qADetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="qaBox">
+  <view class="qaBox" v-if="ifShow">
     <view class="qaTopInfo">
       <view class="qaTopInfoBox" @click="goGoodsDetails">
         <image :src="detailList.image"></image>
@@ -51,11 +51,12 @@ export default {
   	  productId:'',
   	  images:'',
   	  productName:'',
-	  problemsData:{},
-	  answerText:"",
-	  answerslength:0,
-	  num:0,
-	  isIphone: false,
+	    problemsData:{},
+	    answerText:"",
+	    answerslength:0,
+	    num:0,
+	    isIphone: false,
+      ifShow: false
     }
   },
   onLoad(options) {
@@ -79,6 +80,7 @@ export default {
 			productId:this.problemsData.productId,
 		},'GET').then(res => {
 	  		this.detailList = res.data
+        this.ifShow = true
 			this.answerslength = this.detailList.answers.length
 			uni.removeStorageSync('seeAllFnData')
 	  	}).catch(res => {

pages_category_page1/integral/exchangeDetail.vue

@@ -15,7 +15,7 @@
             <view class="fs48 font-color-C83732 flex-items">
               <view class="mar-right-20">{{currentCoupon.credit||0}}积分</view>
               <view class="remaining fs24 font-color-C83732">
-                还剩{{currentCoupon.stockNumber - currentCoupon.takeCount||0}}件
+                还剩{{currentCoupon.stockNumber||0}}件
               </view>
             </view>
             <view class="fs32 font-color-333" v-if="currentCoupon.fullMoney !== 0">满{{currentCoupon.fullMoney}}{{currentCoupon.couponType === 1 ? '减' : '打'}}{{currentCoupon.reduceMoney}}{{currentCoupon.couponType === 1 ? '元' : '折'}}券</view>
@@ -154,11 +154,11 @@ export default {
           title: '兑换成功',
           icon:"success"
         })
-        // setTimeout(() => {
-        //   uni.navigateTo({
-        //     url: '/pages_category_page1/integral/index?tabActive=2'
-        //   })
-        // }, 2000)
+        setTimeout(() => {
+          uni.navigateTo({
+            url: '/pages_category_page1/integral/index?tabActive=2'
+          })
+        }, 1500)
       }).catch(res => {
         if(res.code !== '200'){
           uni.showToast({
@@ -179,6 +179,11 @@ export default {
         title: '兑换成功',
         icon:"success"
       })
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages_category_page1/integral/index?tabActive=2'
+        })
+      }, 1500)
     }
   }
 }

pages_category_page1/integral/index.vue

@@ -18,16 +18,16 @@
               </view>
               <view class="integralInfo flex-items flex-sp-between mar-top-20">
                 <view class="itemBox">
-                  <view class="integraNum fs36 font-color-333">{{ memberData.totalCredit }}</view>
-                  <view class="fs24 font-color-666">累计积分</view>
+                  <view class="integraNum fs32 font-color-333 fs-weight-400">{{ memberData.totalCredit }}</view>
+                  <view class="fs24 font-color-333 fs-weight-400">累计积分</view>
                 </view>
                 <view class="itemBox">
-                  <view class="integraNum fs36 font-color-333">{{ memberData.totalCredit - memberData.credit }}</view>
-                  <view class="fs24 font-color-666">累计消费</view>
+                  <view class="integraNum fs32 font-color-333 fs-weight-400">{{ memberData.totalCredit - memberData.credit }}</view>
+                  <view class="fs24 font-color-333 fs-weight-400">累计消费</view>
                 </view>
                 <view class="itemBox">
-                  <view class="integraNum fs36 font-color-333">{{ memberData.credit }}</view>
-                  <view class="fs24 font-color-666">剩余积分</view>
+                  <view class="integraNum fs32 font-color-333 fs-weight-400">{{ memberData.credit }}</view>
+                  <view class="fs24 font-color-333 fs-weight-400">剩余积分</view>
                 </view>
               </view>
             </view>
@@ -292,7 +292,7 @@ page {
     .nameBox {
       margin-left: 20rpx;
       .name {
-        color: #71521B;
+        color: #333333;
         margin-right: 30rpx;
       }
       .level {

pages_category_page1/memberCenter/activityList.vue

@@ -91,7 +91,7 @@ export default {
       selectIndex:0,
       sortIndex: 1,
       isFixed: false,
-        boxFixedTop: 0,
+      boxFixedTop: 0,
     }
   },
   onPageScroll(res) {
@@ -117,7 +117,10 @@ export default {
       this.shopId = 0
       this.shopDiscountId = 0
     }
-    this.getMemberList()
+    
+  },
+  onShow() {
+  	this.getMemberList()
   },
   onReachBottom(){
     if(this.loadingType == 1){
@@ -194,6 +197,10 @@ export default {
       })
     },
     getMemberList(){
+      uni.showLoading({
+        mask: true,
+        title: '加载中...',
+      })
       let param = ''
       const storageKey = uni.getStorageSync('storage_key');
       if(storageKey){
@@ -209,10 +216,7 @@ export default {
           param.volume = this.volume
         }
         NET.request(API.getMemberProducts,param,'GET').then(res => {
-          // if(this.shopShowType == false){
-          //   this.dateformat(res.data.time)
-          //   this.countDown()
-          // }
+          uni.hideLoading()
           if(res.data.list.length == 0){
             this.loadingType = 1
           }else{
@@ -466,7 +470,7 @@ page {
   background-color: #333;
   &.is-fixed{
     position: fixed;
-    top: 44rpx;
+    top: 70rpx;
     left: 0;
     width: 100%;
     z-index: 999;

pages_category_page1/memberCenter/index.vue

@@ -1,37 +1,60 @@
 <template>
   <view class="memberCenter" v-if="isShow">
-    <view class="memberBox">
-      <view class="posBox">
-        <view class="memberBoxTop">
-          <view class="memberTopPos">
-            <view class="memberTopBg" :style="{backgroundImage:'url('+levelInfo.memberLevelBackground+')'}">
-              <view class="avatarBox">
-                <image :src="memberData.headImage"></image>
-              </view>
-              <view class="nameBox flex-display">
-                <view class="name fs36">{{memberData.name}}</view>
-                <view class="level">
-                  <image :src="levelInfo.memberLevelIcon"></image>
-                </view>
-              </view>
-              <view class="growing">
-                <view class="growingValue flex-items">
-                  <label class="fs24 font-color-71521B">会员成长值</label>
-                  <label class="fs28 font-color-71521B mar-left-20">{{memberData.growth}}/{{memberData.nextLevelGrowth}}</label>
-                </view>
-                <view class="progressBar">
-                  <view style="width: 100%">
-                    <progress activeColor="#FFEBC4" :percent="getPercent(memberData.notRead, memberData.nextLevelGrowth)" active stroke-width="5" />
+    <view class="memberBg" :style="{backgroundImage:'url('+memberListData[activeIndex].memberLevelBackground+')', 'padding-top': paddingTop + 'px'}">
+      <view class="member-top" :style="{'top': topHeight + 'px'}">
+        <view class="memberTopInfo">
+          <view class="backBox">
+            <image src="https://ceres.zkthink.com/static/images/back_img04.png" class="back" @click="back"></image>
+          </view>
+          <view class="memberTit fs30 font-color-FFF">会员中心</view>
+        </view>
+      </view>
+      <view class="memberBox">
+        <view class="posBox">
+          <view class="memberBoxTop">
+            <view class="memberTopPos">
+              <swiper class="swiper pro-box" next-margin="30rpx" previous-margin="30rpx" :current="activeIndex" :indicator-dots="false" :autoplay="false" @change="swiperChange">
+                <swiper-item class="pro-item-warp" v-for="(item, index) in memberListData" :key="index" >
+                  <view class='box'>
+                    <view class="memberTopBg" :style="{backgroundImage:'url('+item.memberLevelBackground+')'}">
+                      <view class="flex-display flex-sp-between">
+                        <view class="nameBox">
+                          <view class="name fs36">{{memberData.name}}</view>
+                          <view class="level">
+                            <image :src="item.memberLevelIcon"></image>
+                          </view>
+                        </view>
+                        <view class="avatarBox">
+                          <image :src="memberData.headImage"></image>
+                        </view>
+                      </view>
+                      <view class="growing">
+                        <view class="growingValue flex-display flex-sp-between">
+                          <label class="fs24 fs-weight-400 font-color-333">当前会员成长值 {{memberData.growth}}</label>
+                          <label class="fs24 fs-weight-400 font-color-333 mar-left-20" v-if="nextGrowth !== 0 && nextGrowth !== item.growth">{{nextGrowth}}</label>
+                        </view>
+                        <view class="progressBar" v-if="memberData.growth < nextGrowth">
+                          <view style="width: 100%">
+                            <progress activeColor="#FFEBC4" :percent="getPercent(memberData.growth, nextGrowth)" active stroke-width="2" />
+                          </view>
+                        </view>
+                        <view class="currentName" v-else>
+                          以超越该等级
+                        </view>
+                        <!--                      <view class="flex-display flex-sp-between">-->
+                        <!--                        <label class="fs24 font-color-71521B">{{memberData.memberLevelName}}</label>-->
+                        <!--                        <label class="fs24 font-color-71521B">{{memberData.nextLevelName}}</label>-->
+                        <!--                      </view>-->
+                      </view>
+                    </view>
                   </view>
-                </view>
-                <view class="flex-display flex-sp-between">
-                  <label class="fs24 font-color-71521B">{{memberData.memberLevelName}}</label>
-                  <label class="fs24 font-color-71521B">{{memberData.nextLevelName}}</label>
-                </view>
-              </view>
+                </swiper-item>
+              </swiper>
             </view>
           </view>
         </view>
+      </view>
+      <view class="equity">
         <view class="equityBox">
           <view class="equityTit">我的权益</view>
           <view class="equityList">
@@ -42,21 +65,23 @@
           </view>
         </view>
       </view>
-    </view>
-    <view class="signInList">
-      <view class="signTit fs30 font-color-333">快速成长</view>
-      <view class="signInBox">
-        <view class="signItem flex-items flex-sp-between">
-          <view class="itemLeft flex-items">
-            <view class="leftIcon">
-              <image src="https://ceres.zkthink.com/static/img/member/memberList2.png"></image>
-            </view>
-            <view class="leftInfo">
-              <label class="fs28 font-color-333">购物</label>
-              <view class="fs24 font-color-999">购买商品获取相应成长值</view>
+      <view class="signIn">
+        <view class="signInList">
+          <view class="signTit fs30 font-color-333">快速成长</view>
+          <view class="signInBox">
+            <view class="signItem flex-items flex-sp-between">
+              <view class="itemLeft flex-items">
+                <view class="leftIcon">
+                  <image src="https://ceres.zkthink.com/static/img/member/memberList2.png"></image>
+                </view>
+                <view class="leftInfo">
+                  <label class="fs28 font-color-333">购物</label>
+                  <view class="fs24 font-color-999">购买商品获取相应成长值</view>
+                </view>
+              </view>
+              <view class="rightBtn" @click="goToShopping">去购物</view>
             </view>
           </view>
-          <view class="rightBtn" @click="goToShopping">去购物</view>
         </view>
       </view>
     </view>
@@ -73,16 +98,68 @@ export default {
       memberData: {},
       equityList: [],
       levelInfo: {},
-      isShow: false
+      isShow: false,
+      memberListData: [],
+      nextGrowth: 0,
+      activeIndex: 0,
+      topHeight: 10,
+      paddingTop: 50
     }
   },
   onLoad() {
-    this.getMemberShipList()
+    // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    this.topHeight = menuButtonInfo.top
+    this.paddingTop = this.paddingTop + this.topHeight
+    // #endif
+    // #ifdef APP
+    this.topHeight = 50
+    this.paddingTop = 100
+    // #endif
+	
+	// 定时器防止app一开始进入时页面混乱问题
+	setTimeout(()=>{
+	  this.getMemberShipList()
+	},200)
     this.memberData = uni.getStorageSync('storage_userInfo');
-    console.log(this.memberData, 'sfsdfs')
     this.getMemberByMemberLevel()
+    this.getMemberList()
   },
   methods: {
+    swiperChange(item) {
+      console.log(item.detail.current, 'index')
+      this.activeIndex = item.detail.current
+      console.log(typeof this.activeIndex, typeof (this.memberListData.length - 1))
+      let num = 0
+      num = this.activeIndex + 1
+      if (num === this.memberListData.length) {
+        this.nextGrowth = this.memberListData[this.activeIndex].growth
+      } else {
+        console.log('caonima ')
+        this.nextGrowth = this.memberListData[this.activeIndex + 1].growth
+      }
+      this.equityList = this.memberListData[this.activeIndex].membershipList
+    },
+    getMemberList() {
+      NET.request(API.memberList, {
+      }, 'GET').then(res => {
+        this.memberListData = res.data
+        this.memberListData.forEach((item, index) => {
+          if (item.memberLevelId === this.memberData.memberLevelId) {
+            this.activeIndex = index
+            let num = 0
+            num = this.activeIndex + 1
+            if (num === this.memberListData.length) {
+              this.nextGrowth = this.memberListData[this.activeIndex].growth
+            } else {
+              this.nextGrowth = this.memberListData[this.activeIndex + 1].growth
+            }
+            this.equityList = this.memberListData[this.activeIndex].membershipList
+          }
+        })
+      }).catch(res => {
+      })
+    },
     getMemberShipList() {
       // 获取会员信息
       uni.showLoading({
@@ -92,8 +169,8 @@ export default {
       NET.request(API.getMemberShipList, {
       }, 'GET').then(res => {
         uni.hideLoading()
-        this.isShow = true
         this.equityList = res.data
+		this.isShow = true
       }).catch(res => {
       })
     },
@@ -118,52 +195,59 @@ export default {
         uni.setStorageSync('storage_levelInfo', this.levelInfo);
       }).catch(res => {
       })
+    },
+    // 返回上一级
+    back() {
+      uni.navigateBack()
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-page {
-  background: #F8F8F8;
-}
   .memberCenter {
-    border-top: 2rpx solid #4b4b4b;
-    background: url("https://ceres.zkthink.com/static/images/addBankBg.png") no-repeat left top;
     background-size: contain;
     min-height: 800rpx;
-    padding: 0 20rpx;
+    .memberBg {
+      background-repeat: no-repeat;
+      padding-top: 50rpx;
+    }
     .memberBox {
-      min-height: 550rpx;
-      margin-top: 180rpx;
       width: 100%;
-      background: #523e3a;
+      //background: #523e3a;
       border-radius: 25rpx;
       background-size: contain;
       position: relative;
       box-sizing: border-box;
-      .posBox {
-        position: absolute;
-        width: 100%;
-        left: 0;
-        top: -80rpx;
-      }
       .memberBoxTop {
-        padding: 0 20rpx;
         position: relative;
+        .memberTopPos {
+          overflow: hidden;
+          .pro-box {
+            height: 300rpx;
+          }
+          .swiper {
+            .box {
+              height: 300rpx;
+              padding: 4rpx 10rpx;
+            }
+          }
+        }
         .memberTopBg {
           background-size: cover;
           background-repeat: no-repeat;
-          height: 302rpx;
-        }
-        .memberTopBg {
-          padding: 0 20rpx;
+          border-radius: 30rpx;
+          padding: 40rpx 30rpx 30rpx 30rpx;
+          box-shadow: 0 0 5rpx rgba(90,90,90,.5);
+          height: 290rpx;
+          .currentName {
+            font-size: 26rpx;
+            margin-top: 50rpx;
+            color: #71521B;
+          }
         }
       }
       .avatarBox {
-        position: absolute;
-        top: -60rpx;
-        left: 50rpx;
         image {
           width: 110rpx;
           height: 110rpx;
@@ -172,10 +256,10 @@ page {
         }
       }
       .nameBox {
-        padding-top: 90rpx;
         .name {
-          color: #71521B;
+          color: #333333;
           margin-right: 30rpx;
+          margin-bottom: 10rpx;
         }
         .level {
           image {
@@ -185,32 +269,40 @@ page {
         }
       }
       .growing {
+        .growingValue {
+          margin-top: 30rpx;
+        }
         .progressBar {
+          height: 20rpx;
           width: 100%;
           margin: 20rpx 0;
         }
       }
+    }
+    .equity {
+      border-radius: 25rpx 25rpx 0 0;
+      padding: 30rpx;
+      background: #F8F8F8;
+      margin-top: 50rpx;
       .equityBox {
-        text-align: center;
-        background: #332a21;
+        background: #FFFFFF;
         min-height: 326rpx;
-        border-radius: 0 0 25rpx 25rpx;
-        padding-top: 50rpx;
+        border-radius: 20rpx;
+        padding: 10rpx 30rpx 30rpx 30rpx;
         .equityTit {
-          color: #FFEBC4;
-          font-size: 28rpx;
-          background: url("https://ceres.zkthink.com/static/images/quityBg.png") no-repeat center center;
-          background-size: contain;
-          width: 90%;
-          margin: 0 auto;
+          font-weight: bold;
+          height: 92rpx;
+          line-height: 92rpx;
         }
         .equityList {
+          border-top: 2rpx solid #F3F4F5;
           display: flex;
           flex-flow: wrap;
-          margin-top: 30rpx;
+          padding-top: 30rpx;
+          text-align: center;
           .equityItem {
             width: 25%;
-            color: #FFEBC4;
+            color: #666666;
             image {
               width: 92rpx;
               height: 92rpx;
@@ -219,44 +311,75 @@ page {
         }
       }
     }
-    .signInList {
-      background: #FFFFFF;
-      border-radius: 20rpx;
-      padding: 30rpx;
-      .signTit {
-        font-weight: bold;
-        height: 92rpx;
-        line-height: 92rpx;
-      }
-      .signInBox {
-        .signItem {
-          border-top: 2rpx solid #F3F4F5;
-          padding: 30rpx 0;
-          .itemLeft {
-            image {
-              width: 92rpx;
-              height: 92rpx;
-              margin-right: 30rpx;
+    .signIn {
+      padding: 0 30rpx 30rpx 30rpx;
+      background: #F8F8F8;
+      .signInList {
+        background: #FFFFFF;
+        border-radius: 20rpx;
+        padding: 0 30rpx 30rpx 30rpx;
+        .signTit {
+          font-weight: bold;
+          height: 92rpx;
+          line-height: 92rpx;
+        }
+        .signInBox {
+          .signItem {
+            border-top: 2rpx solid #F3F4F5;
+            padding: 30rpx 0;
+            .itemLeft {
+              image {
+                width: 92rpx;
+                height: 92rpx;
+                margin-right: 30rpx;
+              }
             }
           }
+          .rightBtn {
+            width: 160rpx;
+            height: 58rpx;
+            line-height: 58rpx;
+            background: #333333;
+            border-radius: 10rpx;
+            color: #FFEBC4;
+            text-align: center;
+          }
         }
-        .rightBtn {
-          width: 160rpx;
-          height: 58rpx;
-          line-height: 58rpx;
-          background: #333333;
-          border-radius: 10rpx;
-          color: #FFEBC4;
-          text-align: center;
+      }
+    }
+    .member-top {
+      width: 100%;
+      position: fixed;
+      z-index: 99;
+      left: 0;
+      .memberTopInfo {
+        position: relative;
+        width: 100%;
+        height: 60rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      .backBox {
+        position: absolute;
+        left: 10rpx;
+        top: 0rpx;
+        .back {
+          width: 50rpx;
+          height: 50rpx;
+          padding: 0rpx 10rpx;
         }
       }
     }
   }
 </style>
-<style scoped>
+<style>
+page {
+  background: #F8F8F8;
+}
 .progressBar /deep/ .uni-progress-bar {
-  background-color: #C3A670 !important;
-  height: 8rpx !important;
+  background-color: rgb(235, 235, 235, 0.6) !important;
+  height: 5rpx !important;
   border-radius: 22rpx;
 }
 .progressBar /deep/ .uni-progress-bar .uni-progress-inner-bar {

pages_category_page1/orderModule/Intervene.vue

@@ -35,26 +35,13 @@ export default {
       formData:{'folderId': -1},
       headerToken:{Authorization:''},
       productImage:'',
-      type:0
+      afterId: 0,
+      orderId: 0
     }
   },
   onLoad(options) {
-    this.type = options.type;
-    if(options.type == 1){
-      this.addCommentVOList = uni.getStorageSync('addCommentVOList');
-      this.orderProductVO = this.addCommentVOList.skus[0]
-      this.productImage = this.orderProductVO.image
-    }else{
-      this.addCommentVOList = uni.getStorageSync('addCommentVOList');
-      this.orderProductVO = this.addCommentVOList
-      this.productImage = this.orderProductVO.productImage
-    }
-    if(options.commentId){
-      this.commentId = options.commentId
-    }
-    uni.removeStorageSync('addCommentVOList')
-    const res = uni.getStorageSync('storage_key');
-    this.headerToken.Authorization = res.token
+    this.afterId = options.afterId;
+    this.orderId = options.orderId;
   },
   onReady() {
     this.fileList = this.$refs.uUpload.lists
@@ -66,47 +53,40 @@ export default {
           title: '请先说点什么吧',
           icon: 'none'
         })
-        return
+        return false
       }
-      uni.showLoading({
-        mask: true,
-        title: '提交中...',
-      })
       if(this.fileList.length>0){
         this.commentImgsFlag = true
         for(let i=0;i<this.fileList.length;i++){
           this.commentImgs += this.fileList[i].response.data.url+','
         }
+      } else {
+        uni.showToast({
+          title:'请上传举证图片',
+        })
+        return false
       }
-      let data = []
-      if(this.type == 1){
-        data = [{
-          commentId:this.commentId,
-          image:this.commentImgs,
-          comment:this.commentText
-        }]
-      }else if(this.type == 2){
-        data = [{
-          commentId:this.addCommentVOList.commentId,
-          image:this.commentImgs,
-          comment:this.commentText
-        }]
-      }
-      NET.request(API.AdditionalComment,{params:data} , 'POST').then(res => {
+      uni.showLoading({
+        title:'正在申请介入...'
+      })
+      NET.request(API.platform, {
+        afterId: this.afterId,
+        orderId: this.orderId,
+        image: this.commentImgs,
+        reason: this.commentText
+      }, 'POST').then(res => {
         uni.hideLoading()
+        this.intervention = false
         uni.showToast({
-          title: '介入成功',
+          title:'申请成功',
         })
         setTimeout(() => {
-          uni.redirectTo({
-            url: 'userEvaluate'
+          uni.navigateTo({
+            url:`../../pages_category_page2/orderModule/afterSale`
           })
-        }, 1500);
+        }, 2000)
       }).catch(res => {
         uni.hideLoading()
-        uni.showToast({
-          title: res.message,
-        })
       })
     }
   }

pages_category_page1/orderModule/afterSaleApply.vue

@@ -44,7 +44,7 @@
           </view>
           <view class="selectRight flex-items">
             <view class="selectNum">{{number}}件商品</view>
-            <view class="totalPrice">合计：<text>￥{{total}}</text></view>
+            <view class="totalPrice">合计：<text>￥{{total.toFixed(2)}}</text></view>
           </view>
         </view>
         <view class="afterBtnBox flex-items flex-sp-between">

pages_category_page1/orderModule/afterSaleApplyRefund.vue

@@ -21,6 +21,17 @@
         </view>
       </view>
       <view class="afterSale-select-box">
+        <view class="item" @click="refundType">
+          <view class="l">退款类型</view>
+          <view class="r-box" v-model="afterType" v-if="afterType == 1">
+            <text>仅退款</text>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
+          </view>
+          <view class="r-box" v-model="afterType" v-if="afterType == 2">
+            <text>退货退款</text>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
+          </view>
+        </view>
         <view class="item" @click="openStatusSelect">
           <view class="l">货物状态</view>
           <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 0">
@@ -78,6 +89,26 @@
     </view>
 
     <!-- 货物状态弹框 -->
+    <u-popup v-model="refundTypeShow" mode="bottom" border-radius="14">
+      <view class="alert-box">
+        <view class="afterSale-status-box">
+          <view class="status-title">退款类型</view>
+          <view class="item-box">
+            <view class="item" @click="afterType = 1">
+              <text class="status-select-title">仅退款</text>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="afterType == 1" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
+            </view>
+            <view class="item" @click="afterType = 2">
+              <text class="status-select-title">退货退款</text>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="afterType == 2" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
+            </view>
+          </view>
+          <view class="status-btn" @click="closeAfterSelect">确定</view>
+        </view>
+      </view>
+    </u-popup>
     <u-popup v-model="cargoStatusShowFalg" mode="bottom" border-radius="14">
       <view class="alert-box">
         <view class="afterSale-status-box">
@@ -125,6 +156,7 @@ export default {
     return {
       returnImgsList: 1,
       cargoStatusShowFalg: false,
+      refundTypeShow: false,
       reasonShowFalg: false,
       returnReasonIndex: 1,
       list: [],
@@ -149,6 +181,8 @@ export default {
       afterRefund:'',
       orderId:0,
       isIphone: false,
+      commentImgs: '',
+      afterType: 1
     }
   },
   onReady() {
@@ -156,11 +190,11 @@ export default {
     this.fileList = this.$refs.uUpload.lists
   },
   onLoad(options) {
-    if(uni.getStorageSync('applyItem')){
+    if (uni.getStorageSync('applyItem')) {
       this.afterRefund = uni.getStorageSync('applyItem')
       this.list.push(this.afterRefund)
-    }else if(uni.getStorageSync('afterSaleApplyRefund')){
-      this.list= uni.getStorageSync('afterSaleApplyRefund')
+    } else if (uni.getStorageSync('afterSaleApplyRefund')) {
+      this.list = uni.getStorageSync('afterSaleApplyRefund')
       console.log(this.list, 'list')
     }
     this.orderId = parseInt(options.orderId)
@@ -168,8 +202,9 @@ export default {
     this.headerToken.Authorization = res.token
     console.log(this.list, 'list')
     this.list.forEach(el => {
-      this.sellPriceitem = this.sellPriceitem + el.number*el.price
+      this.sellPriceitem = this.sellPriceitem + (el.number*el.price) + el.logisticsPrice
     })
+    this.sellPriceitem = this.sellPriceitem.toFixed(2)
     // this.sellPriceitem = options.sellPriceitem
     this.getReasonEnums()
     uni.removeStorageSync('applyItem')
@@ -177,6 +212,7 @@ export default {
   },
   methods: {
     confirmTap() {
+      console.log(this.fileList, 'commentImgs')
       if(this.fileList.length>0){
         this.commentImgsFlag = true
         for(let i=0;i<this.fileList.length;i++){
@@ -223,7 +259,7 @@ export default {
         // }
         NET.request(API.ApplyReturnMoney, {
           orderId:this.orderId,
-          afterType:1,
+          afterType: this.afterType,
           goodsState:this.ReturnMoneyQuery.goodsState,
           price: this.sellPriceitem,
           returnReason:this.liyoutext,
@@ -260,12 +296,18 @@ export default {
     openStatusSelect() {
       this.cargoStatusShowFalg = true
     },
+    refundType() {
+      this.refundTypeShow = true
+    },
     openReasonSelect() {
       this.reasonShowFalg = true
     },
     closeStatusSelect() {
       this.cargoStatusShowFalg = false
     },
+    closeAfterSelect() {
+      this.refundTypeShow = false
+    },
     closeReasonSelect() {
       this.reasonShowFalg = false
     },

pages_category_page1/orderModule/index.vue

@@ -44,7 +44,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="total-price-box">总价¥{{item.orderPrice}},优惠¥{{item.discountPrice}}
+								<view class="total-price-box">总价¥{{(item.orderPrice + item.logisticsPrice).toFixed(2)}},优惠¥{{item.discountPrice}}
 									<block v-if="item.price > 0">
 										，实付¥{{item.price}}
 									</block>
@@ -479,15 +479,27 @@
 				this.alipayInfo = submitResult
 				// #endif
 				// #ifdef MP-WEIXIN
+				let that = this
 				NET.request(API.gotoPay, submitResult, 'POST').then(res => {
 					uni.requestPayment({
-						privider: 'wxpay',
+						provider: 'wxpay',
 						timeStamp: res.data.timeStamp,
 						nonceStr: res.data.nonceStr,
 						package: res.data.package,
 						signType: res.data.signType,
 						paySign: res.data.paySign,
 						success: function(payRes) {
+							console.log(that.orderId,'this.orderId')
+							console.log(item.collageId,'item.collageId')
+							if(item.collageId){
+								let param = {
+								  orderId:that.orderId,
+								  collageId:item.collageId
+								}
+								NET.request(API.paySuccess, param, 'POST').then(res => {
+									console.log(res,'支付成功')					 
+								})
+							}
 							uni.showToast({
 								icon: 'none',
 								title: '支付成功'

pages_category_page1/orderModule/orderConfirm.vue

@@ -26,7 +26,6 @@
             <view class="top-l">
               <image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" class="shop-img"></image>
               <text class="shop-name">{{item.shopName}}</text>
-              <image src="https://ceres.zkthink.com/static/images/greyArrow.png" class="arrow-img"></image>
             </view>
           </view>
           <view class="order-info-box">
@@ -66,8 +65,8 @@
             <view class="discount-item1" v-if="item.shopCoupons.length>0" @click="showShopCoupons(item,sIndex)">
               <view class="discount-label">店铺优惠</view>
               <view class="discount-info-box flex-items">
-                <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType == 1">-￥{{item.currentCoupon.reduceMoney}}</view>
-                <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType == 2">{{item.currentCoupon.reduceMoney}}折券</view>
+                <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType === 1">-￥{{item.currentCoupon.reduceMoney}}</view>
+                <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType === 2">{{item.currentCoupon.reduceMoney}}折券</view>
                 <image class="discount-img" src="https://ceres.zkthink.com/static/images/arrowRight.png"></image>
               </view>
               <!--							<view class="discount-info-box flex-items" v-else>-->
@@ -78,7 +77,7 @@
             <view class="order-total-box">
               <text class="total-num">共{{item.number}}件</text>
               <text class="total-num ml10">总计</text>
-              <text class="total-price ml10" v-if="item.totalNum > 0">¥{{parseFloat(item.totalNum).toFixed(2)}}</text>
+              <text class="total-price ml10" v-if="item.totalNum > 0">¥{{(parseFloat(item.totalNum) + parseFloat(item.distribution.distributionPrice)).toFixed(2)}}</text>
               <text class="total-price ml10" v-else>¥0.00</text>
             </view>
           </view>
@@ -89,8 +88,8 @@
         <view class="discount-label">平台优惠</view>
         <view class="discount-info-box flex-items">
           <view class="discount-info2" v-if="promotionInfoDTO.couponId">
-            <text v-if="promotionInfoDTO.couponType === 2">{{ reduceMoney }}折</text>
-            <text v-else> -￥{{reduceMoney}}</text>
+            <text v-if="promotionInfoDTO.couponType === 2">{{ promotionInfoDTO.reduceMoney }}折</text>
+            <text v-else> -￥{{ promotionInfoDTO.reduceMoney | clip2Decimal }}</text>
           </view>
           <view class="discount-info1" v-else-if="couponsList.length<1">无</view>
           <view class="discount-info1" v-else>不使用</view>
@@ -98,9 +97,9 @@
         </view>
       </view>
 <!--      积分支付-->
-      <view class="integralPayBox" v-if="settlement.creditDeductLimit !== 0 && totalprice > orderCreditThreshold && integralNum !== 0">
+      <view class="integralPayBox" v-if="integralShow">
         <view class="integralBg">
-          <view class="integralTit fs26">可用{{integralNum}}积分抵扣{{integralPrice}}元</view>
+          <view class="integralTit fs26">可用{{integralNum}}积分抵扣{{integralPrice.toFixed(2)}}元</view>
           <view class="maxIntegral">
             <checkbox-group @change="changeIntegral" style="width: 50rpx">
               <checkbox style="transform:scale(0.7);" class="integralCheckbox" color="#C5AA7B" value="1" :checked="selectIntegral"/>
@@ -135,7 +134,7 @@
                 <label class="fenqi-wenzi">花呗分期</label>
                 <label class="fenqi-charge-fee">手续费 ￥{{chargeFee|clip2Decimal}}</label>
               </view>
-              <label class="fenqi-amount">分期总额 ￥{{ (totalprice - reduceMoney) | clip2Decimal }}</label>
+              <label class="fenqi-amount">分期总额 ￥{{ totalPrice | clip2Decimal }}</label>
               <img class="fenqi-modal" src="https://ceres.zkthink.com/static/images/arrowRight.png"/>
             </view>
           </view>
@@ -156,7 +155,7 @@
       <view class="flex-items flex-sp-between">
         <text class="num-box">共{{totalCount}}件</text>
         <view>
-          <text class="total">合计：</text><text v-if="totalprice>0" class="price">¥{{ totalprice.toFixed(2) }}</text><text v-else class="price">¥0.00</text>
+          <text class="total">合计：</text><text v-if="totalPrice>0" class="price">¥{{ totalPrice.toFixed(2) }}</text><text v-else class="price">¥0.00</text>
         </view>
       </view>
       <!-- active 当有地址时按钮加上active选中的样式-->
@@ -182,13 +181,13 @@
                     :key="index"
                     @click="couponItemTap(index,usableItem)"
                   >
-                    <view class="money-box" v-if="usableItem.couponType == 1">￥{{usableItem.reduceMoney}}</view>
+                    <view class="money-box" v-if="usableItem.couponType === 1">￥{{usableItem.reduceMoney}}</view>
                     <view class="money-box" v-else>{{usableItem.reduceMoney}}折券</view>
                     <view class="info-box">
                       <view class="date font-color-999" style="font-size:22upx;  margin-top: 20upx;">{{getDate(usableItem.startTime.replace(/-/g, '.'))}}-{{getDate(usableItem.endTime.replace(/-/g, '.'))}}</view>
                       <view class="info font-color-999">满{{usableItem.fullMoney}}元可用</view>
                     </view>
-                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="couponCheckedindex == index"></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="usableItem.checked"></image>
                     <image class="check-img" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else></image>
                   </view>
                 </view>
@@ -211,13 +210,13 @@
                 <view class="label-lingqu">可用优惠券列表</view>
                 <view class="couponBox">
                   <view class="coupon-item" v-for="(sItem, index) in shopCouponslist.shopCoupons" :key="sItem.id" @click="shopCouponItemTap(index,sItem)">
-                    <view class="money-box" v-if="sItem.couponType == 1">￥{{sItem.reduceMoney}}</view>
+                    <view class="money-box" v-if="sItem.couponType === 1">￥{{sItem.reduceMoney}}</view>
                     <view class="money-box" v-else>{{sItem.reduceMoney}}折券</view>
                     <view class="date font-color-999" style="font-size:22upx;  margin-top: 10upx;">{{getDate(sItem.startTime.replace(/-/g, '.'))}}-{{getDate(sItem.endTime.replace(/-/g, '.'))}}</view>
                     <view class="info-box">
                       <view class="info font-color-999">满{{sItem.fullMoney}}元可用</view>
                     </view>
-                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="selectCouponIdList.indexOf(sItem.id) >= 0"></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="sItem.checked"></image>
                     <image class="check-img" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else></image>
                   </view>
                 </view>
@@ -256,7 +255,7 @@
       </view>
       <view class="huabei-confirm">
         <view class="fenqi-total-amount">
-          <label class="fenqi-all">分期总额 ￥{{ (totalprice - reduceMoney)|clip2Decimal }}</label>
+          <label class="fenqi-all">分期总额 ￥{{ (totalPrice - reduceMoney)|clip2Decimal }}</label>
           <label class="charge-fee-all">手续费 ￥{{ chargeFee|clip2Decimal }}</label>
         </view>
         <view class="fenqi-confirm">
@@ -268,6 +267,7 @@
 </template>
 
 <script>
+import {hidden} from "../../utils/hidden";
 const NET = require('../../utils/request')
 const API = require('../../config/api')
 // #ifdef H5
@@ -288,18 +288,15 @@ export default {
       shopCouponslist: [],
       promotionInfoDTO: {
         couponId: 0,
-        ifAdd: 1
+        ifAdd: 1,
+        reduceMoney: 0
       },
       shopInfoDTO: {},
       reduceMoney: 0,
-      couponCheckedindex: null,
-      shopcouponCheckedindex: -1,
       submitActive: true,
       distributionPrice: 0, //运费
-      totalprice: 0, //合计
+      totalPrice: 0, //合计
       receiveId: '',
-      couponCheckedType: false,
-      shopCouponCheckedType: true,
       totalCount: 0,
       skuItemList: {},
       shopGroupWorkId: 0,
@@ -311,9 +308,7 @@ export default {
       shopIndex: 0,
       shopCheckedType: true,
       discountPrice: 0,
-      shopCouponIdinfo: 0,
       selectShopCoupon: [], // 已选择店铺优惠券
-      selectCouponIdList: [], // 已选店铺优惠券ID
       chargeFee: 0,  //花呗分期手续费，如果是商户支付手续费，则为0，否则默认计算3期手续费
       huabeiDetail: true,
       showHuabeiPopup: false,
@@ -330,15 +325,17 @@ export default {
       couponType: 0,
       selectIntegral: true,
       integralNum: 0,
-      skuCreditAmountMap: {},
       ifShow: false,
       integralRatio: 0, // 积分兑换比例
-      userTotalCredit: 0,
       integralPrice: 0, // 总积分可减多少元
-      orderCreditThreshold: 0 // 满多少元可以抵扣
+      orderCreditThreshold: 0, // 满多少元可以抵扣
+      integralShow: false, // 显示隐藏积分
+      checkedPlatformCoupon: undefined,
+	  oneClickSubmit:true, //只提交订单一次
     }
   },
   onLoad(options) {
+    this.getQuery()
     this.type = options.type
     if (options.receiveId) {
       this.receiveId = options.receiveId
@@ -346,24 +343,23 @@ export default {
     this.decidePayType()
   },
   onShow() {
-    this.getQuery()
-    if (uni.getStorageSync("skuItemDTOList") != "") {
-      this.skuItemDTOList = uni.getStorageSync('skuItemDTOList')
-      //console.log(this.skuItemDTOList, 66666)
-      if (this.skuItemDTOList[0].shopDiscountId > 0) {
-        this.sumitType = 4
-      } else if (this.skuItemDTOList[0].shopSeckillId > 0) {
-        this.sumitType = 3
-      }
-      this.getSettlement(false)
-    } else if (uni.getStorageSync("skuItemList") != "") {
-      this.skuItemList = uni.getStorageSync("skuItemList")
-      //console.log(this.skuItemList, 999)
-      this.shopGroupWorkId = this.skuItemList.shopGroupWorkId
-      this.sumitType = this.skuItemList.type
-      this.collageId = this.skuItemList.collageId
-      this.getSettlement(true)
-    }
+  	if (uni.getStorageSync("skuItemDTOList") != "") {
+  	  this.skuItemDTOList = uni.getStorageSync('skuItemDTOList')
+  	  //console.log(this.skuItemDTOList, 66666)
+  	  if (this.skuItemDTOList[0].shopDiscountId > 0) {
+  	    this.sumitType = 4
+  	  } else if (this.skuItemDTOList[0].shopSeckillId > 0) {
+  	    this.sumitType = 3
+  	  }
+  	  this.getSettlement(false)
+  	} else if (uni.getStorageSync("skuItemList") != "") {
+  	  this.skuItemList = uni.getStorageSync("skuItemList")
+  	  //console.log(this.skuItemList, 999)
+  	  this.shopGroupWorkId = this.skuItemList.shopGroupWorkId
+  	  this.sumitType = this.skuItemList.type
+  	  this.collageId = this.skuItemList.collageId
+  	  this.getSettlement(true)
+  	}
   },
   onBackPress(e) {
     if (e.from === 'navigateBack') {
@@ -387,18 +383,17 @@ export default {
       }, 'GET').then(res => {
         this.integralRatio = parseFloat(res.data.dictDescribe)
       }).catch(res => {
-
+        console.log('平台端未配置积分兑换比例(1积分抵扣多少金额)')
       })
     },
     // 积分价格计算
     changeIntegral() {
       this.selectIntegral = !this.selectIntegral
       if (this.selectIntegral) {
-        this.totalprice = this.totalprice - this.integralPrice
+        this.totalPrice = this.totalPrice - this.integralPrice
       } else {
-        this.totalprice = this.totalprice + this.integralPrice
+        this.totalPrice = this.totalPrice + this.integralPrice
       }
-      console.log(this.selectIntegral, 'test')
     },
     back() {
       if (this.type == 2 || this.type) {
@@ -416,6 +411,7 @@ export default {
       uni.showLoading({
         title: '加载中...',
       })
+	  this.ifShow = true
       let _url = '',
           _data = ''
       // 是否是拼团
@@ -430,89 +426,62 @@ export default {
           receiveId: this.receiveId
         }
       }
-      //console.log(_data, '_data')
       NET.request(_url, _data, 'POST').then(res => {
         uni.hideLoading()
         this.settlement = res.data
         this.couponsList = res.data.coupons
         this.huabeiChargeType = res.data.huabeiChargeType
-        if (this.huabeiChargeType == 2) {
+        if (this.huabeiChargeType === 2) {
           this.huabeiFeerateList = res.data.huabeiFeerateList
         } else {
           this.huabeiFeerateList = [0, 0, 0]
         }
         let shopLen = this.settlement.shops.length
-        let shoptotal = 0,
-            skuTotalNum = 0,
-            skutotal = 0,
-            isskutotal = 0,
-            isskuTotalNum = 0,
-            skustotal = 0;
-        this.settlement.shops.forEach((value, index) => {
+        this.settlement.shops.forEach((value) => {
           value['totalNum'] = value.total
+          value['pricing'] = 0
         })
+        // 初始化平台券选中状态
+        if (this.settlement.coupons.length > 0) {
+          this.settlement.coupons.forEach((item) => {
+            item.checked = false
+          })
+        }
+        // 默认选中商家的第一张优惠券
         for (let s = 0; s < shopLen; s++) {
-          this.settlement.shops[s].skus.forEach((item, index) => {
+          const curShop = this.settlement.shops[s]
+          curShop.skus.forEach((item) => {
             item['skuTotalNum'] = item.total
           })
-          this.settlement.shops[s].totalNum += this.settlement.shops[s].distribution.distributionPrice
-          //console.log(this.settlement.shops[s].total, '11111')
-          if (this.settlement.shops[s].shopCoupons.length > 0) {
-            if (this.settlement.shops[s].shopCoupons[0].couponType == 1) {
-              // 满减 拿到第一张符合的券
-              let _shopCoupons = this.settlement.shops[s].shopCoupons,
-                  curCoupon = ''
-              for (let i = 0; i < _shopCoupons.length; i++) {
-                console.log(this.settlement.shops[s].totalNum, 'totalNum')
-                if (this.settlement.shops[s].totalNum > this.settlement.shops[s].shopCoupons[i].reduceMoney) {
-                  this.settlement.shops[s].totalNum = this.settlement.shops[s].totalNum - this.settlement.shops[s].shopCoupons[i].reduceMoney
-                  this.settlement.shops[s]['currentCoupon'] = this.settlement.shops[s].shopCoupons[i]
-                  this.shopCouponIdinfo = this.settlement.shops[s].shopCoupons[i].id
-                  this.selectShopCoupon.push(this.settlement.shops[s].shopCoupons[i])
-                  this.selectCouponIdList.push(this.settlement.shops[s].shopCoupons[i].id)
-                  break
-                }
-              }
+          if (curShop.shopCoupons.length > 0) {
+            curShop.shopCoupons.forEach((item) => {
+              item.checked = false
+            })
+            const firstShopCoupon = curShop.shopCoupons[0];
+            let useCoupon = this.useShopCoupon(s, 0)
+            if (useCoupon) {
+              firstShopCoupon.checked = true
+              this.selectShopCoupon.push(firstShopCoupon)
+              curShop['currentCoupon'] = firstShopCoupon
             } else {
-              // 折扣 默认第一张券
-              let skuLen = this.settlement.shops[s].skus.length
-              for (let k = 0; k < skuLen; k++) {
-                let idsLen = this.settlement.shops[s].shopCoupons[0].ids.length
-                for (let i = 0; i < idsLen; i++) {
-                  if (this.settlement.shops[s].skus[k].productId == this.settlement.shops[s].shopCoupons[0].ids[i]) {
-                    skustotal = this.settlement.shops[s].skus[k].total * (this.settlement.shops[s].shopCoupons[0].reduceMoney /
-                        10)
-                    console.log(skustotal, 'skustotal')
-                    this.settlement.shops[s].skus[k].skuTotalNum = skustotal
-                  }
-                }
-                shoptotal += this.settlement.shops[s].skus[k].skuTotalNum
-                this.settlement.shops[s].totalNum = shoptotal.toFixed(2)
-              }
-              // this.settlement.shops[s].total = shoptotal.toFixed(2)
-              this.selectShopCoupon.push(this.settlement.shops[s].shopCoupons[0])
-              this.selectCouponIdList.push(this.settlement.shops[s].shopCoupons[0].id)
-              this.settlement.shops[s]['currentCoupon'] = this.settlement.shops[s].shopCoupons[0]
-              if (this.settlement.shops[0].shopCoupons && this.settlement.shops[0].shopCoupons.length > 0) {
-                this.shopCouponIdinfo = this.settlement.shops[0].shopCoupons[0].id
-              }
+              curShop.totalNum = curShop.total
             }
           }
         }
         if (uni.getStorageSync('receiveItem')) {
-          //console.log(22222)
           let receiveItem = uni.getStorageSync('receiveItem')
           this.userAddressInfo = receiveItem
           this.receiveId = receiveItem.receiveId
+          this.userAddressInfo.receivePhone = hidden(this.userAddressInfo.receivePhone, 3, 4)
         } else if (res.data.receive) {
           this.receiveId = res.data.receive.receiveId
           this.userAddressInfo = res.data.receive
+          this.userAddressInfo.receivePhone = hidden(this.userAddressInfo.receivePhone, 3, 4)
         }
         uni.removeStorageSync('receiveItem')
         this.usableListLength = res.data.coupons.length
-        //console.log(this.selectCouponIdList, 'selectCouponIdList')
         this.getTotal()
-        this.ifShow = true
+        
       }).catch(res => {
         uni.hideLoading()
       })
@@ -528,35 +497,37 @@ export default {
     },
     // 平台优惠券选择
     couponItemTap(index, usableItem) {
-      if (this.selectShopCoupon.length) { // 判断商家卷情况
-        if (this.selectShopCoupon[0].ifAdd === 0) {
-          uni.showToast({
-            title: '不可与商家券券叠加使用！',
-            icon: 'none'
-          })
-          return false
-        }
+      if (!usableItem.checked && this.selectShopCoupon.length) { // 判断商家券情况
+        uni.showToast({
+          title: '不可与商家券券叠加使用！',
+          icon: 'none'
+        })
+        return false
       }
-      if (this.couponCheckedindex === index) {
+      // 已选中的情况下取消选中
+      if (usableItem.checked) {
         let promotionInfoDTO = {}
         if (usableItem.couponId) {
           promotionInfoDTO['couponId'] = 0
           promotionInfoDTO['ifAdd'] = 1
+          promotionInfoDTO['reduceMoney'] = 0
         }
         this.promotionInfoDTO = promotionInfoDTO
-        this.reduceMoney = 0
-        this.couponCheckedindex = null
-        this.couponCheckedType = false
+        usableItem.checked = false
         this.isShowDiscount = false
-        this.getTotal(usableItem)
+        this.checkedPlatformCoupon = undefined
+        this.getTotal()
       } else {
-        //console.log(usableItem.reduceMoney, 'item')
-        let moneySum = 0 // 订单总价
-        let shopslen = this.settlement.shops.length // 结算页店铺数量
-        for (let i = 0; i < shopslen; i++) {
-          moneySum += this.settlement.shops[i].total
+        // 先把所有已选中的平台优惠券改为未选中
+        this.settlement.coupons.forEach((item) => {
+          item.checked = false
+        })
+        let shopSumPrice = 0 // 订单总价
+        let shopsLen = this.settlement.shops.length // 结算页店铺数量
+        for (let i = 0; i < shopsLen; i++) {
+          shopSumPrice += this.settlement.shops[i].totalNum
         }
-        if (usableItem.reduceMoney >= moneySum && usableItem.couponType !== 2) {
+        if (usableItem.couponType === 1 && usableItem.reduceMoney >= shopSumPrice) {
           uni.showToast({
             title: '不可使用大于等于合计金额的优惠劵！',
             icon: 'none'
@@ -568,45 +539,27 @@ export default {
           promotionInfoDTO['couponId'] = usableItem.couponId
           promotionInfoDTO['ifAdd'] = usableItem.ifAdd
           promotionInfoDTO['couponType'] = usableItem.couponType
+          promotionInfoDTO['reduceMoney'] = usableItem.reduceMoney
         }
         this.promotionInfoDTO = promotionInfoDTO
-        this.reduceMoney = usableItem.reduceMoney
-        // this.couponType = usableItem.couponType
-        this.couponCheckedindex = index
-        this.couponCheckedType = true
         this.isShowDiscount = false
-        this.getTotal(usableItem)
+        this.checkedPlatformCoupon = usableItem
+        this.getTotal()
+        // 选中优惠券
+        usableItem.checked = true
       }
     },
     // 店铺优惠券选择
     shopCouponItemTap(index, sItem) {
       // 取消选择优惠券
-      console.log(this.selectShopCoupon, sItem, 'Youhui')
-      for (let i = 0; i < this.selectShopCoupon.length; i++) {
-        // let skusTotal = 0
-        // this.settlement.shops[this.shopIndex].skus.forEach((value, index) => {
-        //   //console.log(value.totalNum, 'total')
-        //   skusTotal += value.totalNum
-        // })
-        // if (this.settlement.shops[this.shopIndex].distribution.distributionPrice > 0) {
-        //   skusTotal += this.settlement.shops[this.shopIndex].distribution.distributionPrice
-        // }
-        // this.settlement.shops[this.shopIndex].total = skusTotal
+      if (sItem.checked) {
+        sItem.checked = false
         this.settlement.shops[this.shopIndex].totalNum = this.settlement.shops[this.shopIndex].total
         this.settlement.shops[this.shopIndex].currentCoupon = {}
-        this.shopcouponCheckedindex = 99999999
-        this.shopCouponCheckedType = false
         this.isShopCoupons = false
-        this.settlement.shops[this.shopIndex].currentCoupon.shopCouponId = 0
-        this.getTotal(sItem)
-        if (this.selectShopCoupon[i].id === sItem.id) {
-          //console.log(666)
-          this.selectCouponIdList.splice(i, 1)
-          this.selectShopCoupon.splice(i, 1)
-          return false
-        }
-        this.selectCouponIdList.splice(i, 1)
-        this.selectShopCoupon.splice(i, 1)
+        this.selectShopCoupon = []
+        this.getTotal()
+        return false
       }
       if (sItem.couponType === 1 && this.settlement.shops[this.shopIndex].total < sItem.reduceMoney) {
         uni.showToast({
@@ -614,157 +567,260 @@ export default {
           icon: 'none'
         })
       } else {
-        console.log('fsdfsdfsdfdss')
-        console.log(this.totalprice, 'total')
         // 选择优惠券
-        if (this.selectCouponIdList.indexOf(sItem.id) === -1) {
-          if (this.promotionInfoDTO.couponId !== 0) {
-            if (sItem.ifAdd == 0) {
-              uni.showToast({
-                title: '此券不可与平台券叠加！',
-                icon: 'none'
-              })
-              return false
-            }
-          }
-          if (sItem.couponType == 1) {
-            //console.log(sItem.reduceMoney, this.totalprice, this.reduceMoney, 'test111')
-            if (sItem.reduceMoney >= (this.totalprice - this.reduceMoney)) {
-              //console.log(2)
-              uni.showToast({
-                title: '优惠券优惠金额不能大于等于合计金额！',
-                icon: 'none'
-              })
-              return false
-            }
+        if (this.promotionInfoDTO.couponId !== 0) {
+          uni.showToast({
+            title: '此券不可与平台券叠加！',
+            icon: 'none'
+          })
+          return false
+        }
+        if (sItem.couponType === 1) {
+          if (sItem.reduceMoney >= this.settlement.shops[this.shopIndex].total) {
+            uni.showToast({
+              title: '优惠券优惠金额不能大于等于合计金额！',
+              icon: 'none'
+            })
+            return false
           }
-          console.log(this.settlement.shops[this.shopIndex].currentCoupon, '优惠券')
+        }
+
+        this.isShopCoupons = false
+        this.shopCouIndex = index
+        let useCoupon = this.useShopCoupon(this.shopIndex, this.shopCouIndex)
+        if (useCoupon) {
+          // 确认使用当前点击的商家券，先将所有的商家券取消选中
           for (let i = 0; i < this.selectShopCoupon.length; i++) {
-            if (this.selectShopCoupon[i].id === this.settlement.shops[this.shopIndex].currentCoupon.id) {
-              this.selectCouponIdList.splice(i, 1)
-              this.selectShopCoupon.splice(i, 1)
-            }
+            this.selectShopCoupon[i].checked = false
           }
-          this.shopcouponCheckedindex = index
-          this.shopCouponCheckedType = true
-          this.isShopCoupons = false
-          this.shopCouponIdinfo = sItem.id
+          this.selectShopCoupon = []
+
+          sItem.checked = true
           this.settlement.shops[this.shopIndex].currentCoupon = sItem
-          this.selectCouponIdList.push(sItem.id)
           this.selectShopCoupon.push(sItem)
-          let shoptotal = 0
-          let skustotal = 0
-          let sum = 0
-          // this.settlement.shops[this.shopIndex].skus.forEach((value, index) => {
-          //   //console.log(value.totalNum, 'total')
-          //   sum += value.totalNum
-          // })
-          // if (this.settlement.shops[this.shopIndex].distribution.distributionPrice > 0) {
-          //   sum += this.settlement.shops[this.shopIndex].distribution.distributionPrice
-          // }
-          // this.settlement.shops[this.shopIndex].total = sum
-          this.shopCouIndex = index
-          //console.log(this.shopIndex, this.shopCouIndex)
-          if (sItem.couponType == 1) {
-            this.settlement.shops[this.shopIndex].totalNum = this.settlement.shops[this.shopIndex].total - sItem.reduceMoney
-            //console.log(this.settlement.shops[this.shopIndex].total, 's1')
-          } else {
-            let skuLen = this.settlement.shops[this.shopIndex].skus.length
-            console.log(skuLen, 121200000)
-            for (let k = 0; k < skuLen; k++) {
-              let idsLen = this.settlement.shops[this.shopIndex].shopCoupons[this.shopCouIndex].ids.length
-              for (let i = 0; i < idsLen; i++) {
-                if (this.settlement.shops[this.shopIndex].skus[k].productId === this.settlement.shops[this.shopIndex].shopCoupons[this.shopCouIndex].ids[i]) {
-                  console.log(this.settlement.shops[this.shopIndex].skus[k].total, 'fssdfdsfdsf')
-                  skustotal = this.settlement.shops[this.shopIndex].skus[k].total * (this.settlement.shops[this.shopIndex].shopCoupons[
-                      this.shopCouIndex].reduceMoney / 10)
-                  this.settlement.shops[this.shopIndex].skus[k].skuTotalNum = skustotal
-                }
+        } else {
+          this.settlement.shops[this.shopIndex].totalNum = this.settlement.shops[this.shopIndex].total
+        }
+        this.getTotal()
+      }
+    },
+    useShopCoupon(shopIndex, couponIndex) {
+      const curShop = this.settlement.shops[shopIndex]
+      curShop.totalNum = 0
+      let curCoupon = undefined
+      if (curShop.shopCoupons && curShop.shopCoupons.length > 0) {
+        curCoupon = curShop.shopCoupons[couponIndex]
+      }
+      if (!curCoupon) {
+        return false
+      }
+      let useCoupon = false
+      if (curCoupon.couponType === 1) {
+        if (curShop.total > curCoupon.reduceMoney) {
+          curShop.totalNum = curShop.total - curCoupon.reduceMoney
+          useCoupon = true
+        }
+      } else {
+        let shopTotal = 0
+        let skuLen = curShop.skus.length
+        let priceCount = 0
+        let couponMatchPriceCount = 0
+        for (let k = 0; k < skuLen; k++) {
+          let idsLen = curCoupon.ids.length
+          // 定价捆绑的优惠额外处理
+          let priceId = curShop.skus[k].priceId
+          for (let i = 0; i < idsLen; i++) {
+            if (curShop.skus[k].productId === curCoupon.ids[i]) {
+              if (priceId > 0) {
+                couponMatchPriceCount++
+              } else {
+                curShop.skus[k].skuTotalNum = curShop.skus[k].total * (curCoupon.reduceMoney / 10)
+                useCoupon = true
               }
-              shoptotal += this.settlement.shops[this.shopIndex].skus[k].skuTotalNum
-              this.settlement.shops[this.shopIndex].totalNum = parseFloat(shoptotal.toFixed(2))
-              console.log(this.settlement.shops[this.shopIndex].skuTotalNum, 'shoptotal22')
             }
           }
-          this.getTotal(sItem)
+          if (priceId > 0) {
+            priceCount++;
+          } else {
+            shopTotal += curShop.skus[k].skuTotalNum
+            curShop.totalNum = parseFloat(shopTotal.toFixed(2))
+          }
+        }
+        if (couponMatchPriceCount >= priceCount && curShop.priceAfterDiscount >= curCoupon.fullMoney) {
+          let priceTotal = curShop.priceAfterDiscount * (curCoupon.reduceMoney / 10)
+          curShop.totalNum += priceTotal
+          useCoupon = true
         }
       }
+      return useCoupon
     },
-    getTotal(item) {
-      this.totalprice = 0
+    /**
+     * 计算总价，商家券的优惠计算，在调用本方法之前已经计算好在shops[].totalNum
+     */
+    getTotal() {
+      this.totalPrice = 0
       this.totalCount = 0
       this.integralPrice = 0
       this.integralNum = 0
-      let allNum = 0
-      let shopslen = this.settlement.shops.length
-      for (let i = 0; i < shopslen; i++) {
-        this.totalprice += parseFloat(this.settlement.shops[i].totalNum)
-        allNum += this.settlement.shops[i].totalNum
+      let shopSumPrice = 0
+      let shopsLen = this.settlement.shops.length
+
+      for (let i = 0; i < shopsLen; i++) {
+        this.totalPrice += parseFloat(this.settlement.shops[i].totalNum)
+        shopSumPrice += parseFloat(this.settlement.shops[i].totalNum)
         this.totalCount += this.settlement.shops[i].number
       }
-      if (item) {
-        console.log(this.discountPrice, 'discountPrice', allNum, 'allNum', this.totalprice, 'totalprice', this.reduceMoney, 'reduceMoney')
-        if (item.couponType === 1 && this.totalprice - this.reduceMoney > 0) { // 满减
-          this.discountPrice = allNum - this.totalprice + this.reduceMoney
-          this.totalprice = allNum - this.discountPrice
-        } else if (item.couponType === 2 && this.reduceMoney > 0) { // 折扣
-          this.discountPrice = allNum - this.totalprice * (this.reduceMoney / 10)
-          this.totalprice = allNum - this.discountPrice
-        } else {
-          this.discountPrice = allNum
+      if (this.checkedPlatformCoupon) {
+        if (this.checkedPlatformCoupon.couponType === 1 && this.totalPrice - this.checkedPlatformCoupon.reduceMoney > 0) { // 满减
+          this.totalPrice = shopSumPrice - this.checkedPlatformCoupon.reduceMoney
+        } else if (this.checkedPlatformCoupon.couponType === 2 && this.checkedPlatformCoupon.reduceMoney > 0) { // 折扣
+          this.totalPrice = shopSumPrice * this.checkedPlatformCoupon.reduceMoney / 10
         }
-        console.log('discountPrice', this.discountPrice, 'reduceMoney', this.reduceMoney)
       }
       // 积分支付计算
-      var skuCreditMap = Object.keys(this.settlement.skuCreditMap);
-      if(skuCreditMap.length > 0) {
-        let creditNum = {}
-        creditNum = this.settlement.skuCreditMap
+      this.calcCredit()
+      // 加上每个商家的运费
+      this.settlement.shops.forEach((item) => {
+        this.totalPrice = this.totalPrice + item.distribution.distributionPrice
+      })
+      this.recalcHuabei()
+    },
+    calcCredit() {
+      let shopsLen = this.settlement.shops.length
+      const skuRemainMap = this.calcSkuRemainMap()
+      const skuCreditMap = this.settlement.skuCreditMap;
+      if(skuCreditMap && this.integralRatio > 0) {
         this.orderCreditThreshold = this.settlement.orderCreditThreshold
-        this.userTotalCredit = this.settlement.userTotalCredit
-        for (let i in creditNum) {
-          console.log(creditNum[i], 'item')
-          this.integralNum += creditNum[i]
+        let remainUserCredit = this.settlement.userTotalCredit
+        let remainTotalPrice = Math.round((this.totalPrice + Number.EPSILON) * 100) / 100
+        let remainDeductLimit = this.settlement.creditDeductLimit
+        // 只有订单金额达到阈值，并且用户还有剩余的积分，才能进行积分抵扣
+        if (this.totalPrice >= this.orderCreditThreshold && remainUserCredit > 0 && remainDeductLimit > 0) {
+          for (let i=0;i<shopsLen;i++) {
+            const curShop = this.settlement.shops[i]
+            let skuLen = curShop.skus.length
+            for (let j=0;j<skuLen;j++) {
+              const curSku = curShop.skus[j]
+              const skuId = curSku.skuId
+              if (skuCreditMap[skuId] > 0 && skuRemainMap[skuId] > 0 && remainUserCredit > 0 && remainTotalPrice > 0) {
+                // 抵扣之后，必须保证整个订单至少还有0.01元，可用于支付
+                if (remainTotalPrice - skuRemainMap[skuId] < 0.01) {
+                  skuRemainMap[skuId] -= 0.01
+                }
+                // 按照比例换算成需要多少积分抵扣(取整)
+                let finalSkuCredit = parseInt((skuRemainMap[skuId] / this.integralRatio).toString());
+                // 优先以商家配置的商品可抵扣积分为准
+                if (skuCreditMap[skuId] < finalSkuCredit) {
+                  finalSkuCredit = skuCreditMap[skuId]
+                }
+                // 不能超过用户剩余积分
+                if (remainUserCredit < finalSkuCredit) {
+                  finalSkuCredit = remainUserCredit
+                }
+                // 不能超过整个订单可抵扣积分
+                if (remainDeductLimit < finalSkuCredit) {
+                  finalSkuCredit = remainDeductLimit
+                }
+                curSku.cachedCredit = finalSkuCredit
+                this.integralNum += finalSkuCredit
+                remainUserCredit -= finalSkuCredit
+                remainDeductLimit -= finalSkuCredit
+                remainTotalPrice -= finalSkuCredit
+              }
+            }
+          }
         }
-        if (this.integralNum > this.settlement.creditDeductLimit) {
-          this.integralNum = this.settlement.creditDeductLimit
-        } else if (this.integralNum > this.userTotalCredit) {
-          this.integralNum = this.userTotalCredit
+        //计算抵扣价格
+        if (this.integralNum !== 0) {
+          this.integralNum = parseInt(this.integralNum)
+          this.integralPrice = this.integralNum * this.integralRatio
+          if (this.integralNum !== 0) {
+            this.integralShow = true
+          }
+          if (this.selectIntegral) {
+            this.totalPrice = this.totalPrice - this.integralPrice
+          }
+        } else {
+          this.integralShow = false
         }
-        this.integralPrice = this.integralNum * this.integralRatio
-        // 总价减去积分金额
-        this.totalprice = this.totalprice - this.integralPrice
       }
-      this.recalcHuabei()
-      // console.log(this.totalprice - this.reduceMoney, 'dis')
+    },
+    /**
+     * 计算sku在整个运单价格中的剩余价值 1元的订单，打1折优惠之后，剩余价值就是0.1元
+     */
+    calcSkuRemainMap() {
+      let skuRemainMap = {}
+      let shopsLen = this.settlement.shops.length
+      const skuCreditMap = this.settlement.skuCreditMap
+      for (let i=0;i<shopsLen;i++) {
+        const curShop = this.settlement.shops[i]
+        let skuLen = curShop.skus.length
+        let checkedShopCoupon = undefined
+        curShop.shopCoupons.forEach((item) => {
+          if (item.checked) {
+            checkedShopCoupon = item
+          }
+        })
+        for (let j=0;j<skuLen;j++) {
+          const curSku = curShop.skus[j]
+          const skuId = curSku.skuId
+          // 不是定价捆绑，并且有配置可抵扣的积分，才有必要计算比例
+          if (!curSku.priceId > 0 && skuCreditMap[skuId] > 0) {
+            let remainSkuMoney = curSku.price * curSku.number
+            if (checkedShopCoupon) {
+              let skuShopPercent = remainSkuMoney / curShop.total
+              let curReduceMoney = 0
+              if (checkedShopCoupon.couponType === 1) {
+                curReduceMoney = checkedShopCoupon.reduceMoney * skuShopPercent
+              } else {
+                curReduceMoney = remainSkuMoney * (10 - checkedShopCoupon.reduceMoney) / 10
+              }
+              remainSkuMoney = remainSkuMoney - curReduceMoney
+            }
+            // 使用平台券
+            if (this.checkedPlatformCoupon && remainSkuMoney > 0) {
+              // 满减
+              if (this.checkedPlatformCoupon.couponType === 1) {
+                let skuTotalPercent = remainSkuMoney / this.totalPrice
+                remainSkuMoney -= this.checkedPlatformCoupon.reduceMoney * skuTotalPercent
+              }
+              // 折扣
+              else {
+                remainSkuMoney = remainSkuMoney * this.checkedPlatformCoupon.reduceMoney / 10
+              }
+            }
+            skuRemainMap[skuId] = remainSkuMoney
+          }
+        }
+      }
+      return skuRemainMap
     },
     recalcHuabei() {
-      if (this.paymentMode == 3) {
-        this.fenqiFeeList[0] = (this.totalprice - this.reduceMoney) * (1 + this.huabeiFeerateList[0] / 100) / 3
-        this.fenqiFeeList[1] = (this.totalprice - this.reduceMoney) * (1 + this.huabeiFeerateList[1] / 100) / 6
-        this.fenqiFeeList[2] = (this.totalprice - this.reduceMoney) * (1 + this.huabeiFeerateList[2] / 100) / 12
+      if (this.paymentMode === 3) {
+        this.fenqiFeeList[0] = this.totalPrice * (1 + this.huabeiFeerateList[0] / 100) / 3
+        this.fenqiFeeList[1] = this.totalPrice * (1 + this.huabeiFeerateList[1] / 100) / 6
+        this.fenqiFeeList[2] = this.totalPrice * (1 + this.huabeiFeerateList[2] / 100) / 12
 
-        this.chargeFeeList[0] = (this.totalprice - this.reduceMoney) * (this.huabeiFeerateList[0] / 100) / 3
-        this.chargeFeeList[1] = (this.totalprice - this.reduceMoney) * (this.huabeiFeerateList[1] / 100) / 6
-        this.chargeFeeList[2] = (this.totalprice - this.reduceMoney) * (this.huabeiFeerateList[2] / 100) / 12
+        this.chargeFeeList[0] = this.totalPrice * (this.huabeiFeerateList[0] / 100) / 3
+        this.chargeFeeList[1] = this.totalPrice * (this.huabeiFeerateList[1] / 100) / 6
+        this.chargeFeeList[2] = this.totalPrice * (this.huabeiFeerateList[2] / 100) / 12
 
         var index = 0;
-        if (this.huabeiPeriod == 6) {
+        if (this.huabeiPeriod === 6) {
           index = 1
-        } else if (this.huabeiPeriod == 12){
+        } else if (this.huabeiPeriod === 12){
           index = 2
         }
-        this.chargeFee = ((this.totalprice - this.reduceMoney) * (this.huabeiFeerateList[index] / 100)).toFixed(2)
+        this.chargeFee = (this.totalPrice * (this.huabeiFeerateList[index] / 100)).toFixed(2)
       }
     },
-    // 展示平台端优惠卷
+    // 展示平台端优惠券
     showDiscount() {
       // let shopifAdd = 1
       // if(this.settlement.shops[this.shopIndex].shopCoupons.length>0){
       // 	shopifAdd = this.settlement.shops[this.shopIndex].shopCoupons[this.shopCouIndex].ifAdd
       // }
       if (this.settlement.coupons.length > 0) {
-        //console.log(this.selectShopCoupon, 'selectShopCoupon')
         for (let i = 0; i < this.selectShopCoupon.length; i++) {
           if (this.selectShopCoupon[i].ifAdd == 0) {
             uni.showToast({
@@ -784,13 +840,11 @@ export default {
     },
     // 显示店铺优惠券
     showShopCoupons(item, sIndex) {
-      //console.log(item, 'item')
       if (item.shopCoupons.length > 0) {
         this.isShopCoupons = true
         this.shopCouponslist = item
         this.shopCouponsLength = item.shopCoupons.length
         this.shopIndex = sIndex
-        //console.log(this.selectCouponIdList.indexOf(item.shopCoupons[0].id), '测试')
       } else {
         uni.showToast({
           title: '暂无可用优惠券',
@@ -806,7 +860,7 @@ export default {
     },
     payTypeChange(event) {
       this.paymentMode = event.target.value;
-      if (this.paymentMode == 3) {
+      if (this.paymentMode === 3) {
         this.huabeiDetail = true
       } else {
         this.huabeiDetail = false
@@ -816,13 +870,12 @@ export default {
     huabeiPeriodChange(event) {
       this.huabeiPeriod = event.target.value
       var feeRate = this.huabeiFeerateList[2]
-      if (this.huabeiPeriod == 3) {
+      if (this.huabeiPeriod === 3) {
         feeRate = this.huabeiFeerateList[0]
-      } else if(this.huabeiPeriod == 6) {
+      } else if(this.huabeiPeriod === 6) {
         feeRate = this.huabeiFeerateList[1]
       }
-      //console.log('feeRate: ', feeRate)
-      this.chargeFee = ((this.totalprice - this.reduceMoney) * feeRate / 100).toFixed(2)
+      this.chargeFee = (this.totalPrice * feeRate / 100).toFixed(2)
     },
     showHuabeiDetail () {
       this.showHuabeiPopup = true
@@ -835,260 +888,271 @@ export default {
           icon: 'none'
         })
       } else {
-        if (this.userAddressInfo.receiveName) {
-          uni.showLoading({
-            mask: true,
-            title: '订单提交中...',
-          })
-          let couponIdinfo = 0
-          if (this.promotionInfoDTO.couponId) {
-            couponIdinfo = this.promotionInfoDTO.couponId
-          }
-          let price = 0
-          if (this.totalprice - this.reduceMoney > 0) {
-            price = this.totalprice - this.reduceMoney
-          } else {
-            price = 0
-          }
-          let data = {
-            shopDiscountId: null,
-            collageId: this.collageId,
-            type: this.sumitType,
-            shopGroupWorkId: null,
-            receiveId: this.receiveId,
-            couponId: couponIdinfo,
-            price: price,
-            remark: "",
-            shops: [],
-            discountPrice: this.discountPrice,
-            shopSeckillId: null
-
-          }
-          if (this.shopGroupWorkId > 0) {
-            data.shopGroupWorkId = this.shopGroupWorkId
-          }
-          if (this.skuItemDTOList != '') {
-            if (this.skuItemDTOList[0].shopDiscountId > 0) {
-              data.shopDiscountId = this.skuItemDTOList[0].shopDiscountId
-            } else if (this.skuItemDTOList[0].shopSeckillId > 0) {
-              data.shopSeckillId = this.skuItemDTOList[0].shopSeckillId
-            }
-          }
-          let datashopslen = this.settlement.shops.length
-          for (let n = 0; n < datashopslen; n++) {
-            let shopsobj = {}
-            shopsobj["shopId"] = this.settlement.shops[n].shopId
-            shopsobj["sceneId"] = this.settlement.shops[n].sceneId
-            shopsobj["distribution"] = {}
-            shopsobj["skus"] = []
-            if (this.settlement.shops[n].currentCoupon) {
-              shopsobj["id"] = this.settlement.shops[n].currentCoupon.id
+		 
+	    if(this.oneClickSubmit){
+			this.oneClickSubmit = false
+			if (this.userAddressInfo.receiveName) {
+			  uni.showLoading({
+				mask: true,
+				title: '订单提交中...',
+			  })
+			  let couponIdinfo = 0
+			  if (this.promotionInfoDTO.couponId) {
+				couponIdinfo = this.promotionInfoDTO.couponId
+			  }
+			  let data = {
+				shopDiscountId: null,
+				collageId: this.collageId,
+				type: this.sumitType,
+				shopGroupWorkId: null,
+				receiveId: this.receiveId,
+				couponId: couponIdinfo,
+				price: this.totalPrice,
+				remark: "",
+				shops: [],
+				discountPrice: this.discountPrice,
+				shopSeckillId: null
+			  }
+			  if (this.shopGroupWorkId > 0) {
+				data.shopGroupWorkId = this.shopGroupWorkId
+			  }
+			  if (this.skuItemDTOList != '') {
+				if (this.skuItemDTOList[0].shopDiscountId > 0) {
+				  data.shopDiscountId = this.skuItemDTOList[0].shopDiscountId
+				} else if (this.skuItemDTOList[0].shopSeckillId > 0) {
+				  data.shopSeckillId = this.skuItemDTOList[0].shopSeckillId
+				}
+			  }
+			  let datashopslen = this.settlement.shops.length
+			  for (let n = 0; n < datashopslen; n++) {
+				let shopsobj = {}
+				shopsobj["shopId"] = this.settlement.shops[n].shopId
+				shopsobj["sceneId"] = this.settlement.shops[n].sceneId
+				shopsobj["distribution"] = {}
+				shopsobj["skus"] = []
+				if (this.settlement.shops[n].currentCoupon) {
+				  shopsobj["id"] = this.settlement.shops[n].currentCoupon.id
+				}
+				data.shops.push(shopsobj)
+				data.shops[n].distribution.distributionPrice = this.settlement.shops[n].distribution.distributionPrice
+				data.shops[n].distribution.distributionName = this.settlement.shops[n].distribution.distributionName
+				let dataskuslen = this.settlement.shops[n].skus.length
+				for (let m = 0; m < dataskuslen; m++) {
+				  let skusobj = {}
+				  const curSku = this.settlement.shops[n].skus[m]
+				  skusobj["skuId"] = curSku.skuId
+				  skusobj["number"] = curSku.number
+				  skusobj["ifLogistics"] = curSku.ifLogistics
+				  skusobj["selected"] = curSku.selected
+				  skusobj["platformSeckillId"] = curSku.platformSeckillId
+				  skusobj["platformDiscountId"] = curSku.platformDiscountId
+				  skusobj["shopSeckillId"] = curSku.shopSeckillId
+				  skusobj["shopDiscountId"] = curSku.shopDiscountId
+				  skusobj["sceneId"] = curSku.sceneId
+				  skusobj["priceId"] = curSku.priceId
+				  skusobj["useMember"] = curSku.useMember
+				  skusobj["composeId"] = curSku.composeId
+				  // 积分传参
+				  if (this.selectIntegral && curSku.cachedCredit) {
+					skusobj["useCredit"] = curSku.cachedCredit
+					skusobj["useCreditAmount"] = (curSku.cachedCredit * this.integralRatio).toFixed(2)
+				  }
+				  data.shops[n].skus.push(skusobj)
+				}
+			  }
+			  // #ifdef H5
+			  data.paymentMode = 1
+			  data.subPaymentMode = 3
+			  // #endif
+
+			  // #ifdef MP-WEIXIN
+			  data.paymentMode = 1
+			  data.subPaymentMode = 1
+			  // #endif
+
+			  // #ifdef APP-PLUS
+			  data.paymentMode = 1
+			  // #endif
+
+			  // #ifdef MP-ALIPAY
+			  data.paymentMode = 2
+			  data.subPaymentMode = 1
+			  // #endif
+
+			  uni.hideLoading()
+			  NET.request(API.PlaceOrder, data, 'POST').then(res => {	  
+				if(this.type == 2){
+					let carSkusData = data.shops
+					let skusArr = []
+					for(let i= 0; i<carSkusData.length; i++){
+						carSkusData[i].skus.map(item=>{
+							skusArr.push(item.skuId)
+						})
+					}
+					// 从购物车中点击结算时删除对应购物车商品
+					NET.request(API.DeleteCart, {
+						ids: skusArr
+					}, 'POST').then(res => {
+						console.log(res,'删除对应购物车商品')
+					}).catch(res => {})
+				}
+				let submitResult = res.data
+				that.orderId = res.data.orderId
+				//console.log(submitResult, '测试')
+				submitResult.type = 1
+				submitResult.paymentMode = data.paymentMode
+				// #ifdef H5
+				let ua = navigator.userAgent.toLowerCase();
+				if (ua.match(/MicroMessenger/i) == "micromessenger") {
+				this.payRequest(submitResult)
+				}else{
+				NET.request(API.gotoH5Pay, submitResult, 'POST').then(res => {
+					//console.dir(res)
+					location.replace(res.data.mwebUrl)
+					// window.location.replace(url)
+				  }).catch(err => {
+					this.submitActive = true
+					uni.hideLoading()
+					uni.showToast({
+					  title: '支付失败',
+					  icon: 'none'
+					})
+					uni.navigateTo({
+					  url: '../orderModule/index?type=1'
+					})
+				})
+				
+			   }
+				// #endif
+				// #ifdef MP-ALIPAY
+				submitResult.huabeiPeriod = this.huabeiPeriod
+				submitResult.paymentMode = this.paymentMode
+				this.aliPay(submitResult)
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				NET.request(API.gotoPay, submitResult, 'POST').then(res => {
+				  console.dir(res)
+				  uni.requestPayment({
+					provider: 'wxpay',
+					timeStamp: res.data.timeStamp,
+					nonceStr: res.data.nonceStr,
+					package: res.data.package,
+					signType: res.data.signType,
+					paySign: res.data.paySign,
+					// success: function(payRes) {
+					success: function(payRes) {
+					  if(that.collageId){
+						  console.log(that.collageId,'that.collageId99999')
+					  	let param = {
+					  	  orderId:that.orderId,
+					  	  collageId:that.collageId
+					  	}
+					  	NET.request(API.paySuccess, param, 'POST').then(res => {
+					  		console.log(res,'支付成功')					 
+					  	})
+					  }
+					  uni.showToast({
+						icon: 'none',
+						title: '支付成功'
+					  })
+					  //console.log(submitResult.orderId, 'order Id')
+					  uni.navigateTo({
+						url: 'paySuccessful?orderId=' + submitResult.orderId
+					  })
+					},
+					fail: function(err) {
+						uni.showToast({
+							icon: 'none',
+							title: '支付取消'
+						})
+						uni.navigateTo({
+							url: '../orderModule/index?type=1'
+						})
+					}
+				 })
+				}).catch(err => {
+					uni.showToast({
+						title: '支付失败',
+						icon: 'none'
+					})
+					uni.navigateTo({
+						url: '../orderModule/index?type=1'
+					})
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				//console.log(submitResult, 'app-submitResult')
+				NET.request(API.gotoAppPay, submitResult, 'POST').then(res => {
+				  let str = res.data.package
+				  var index = str.lastIndexOf("\=");
+				  str = str.substring(index+1,str.length);
+				  var obj = {
+					appid: res.data.appId,
+					noncestr: res.data.nonceStr,
+					package: 'Sign=WXPay',
+					prepayid: str,
+					timestamp: res.data.timeStamp,
+					sign: 'MD5',
+					partnerid: res.data.partnerId
+				  }
+				  //console.log(res.data, '111')
+				  //console.log(obj, '111')
+				  uni.requestPayment({
+					provider: 'wxpay',
+					orderInfo: obj,
+					success: function(payRes) {
+					  uni.showToast({
+						icon: 'none',
+						title: '支付成功'
+					  })
+					  uni.navigateTo({
+						url: 'paySuccessful?orderId=' + that.orderId
+					  })
+					},
+					fail: function(err) {
+					  //console.log(err)
+					  uni.showToast({
+						icon: 'none',
+						title: '支付取消'
+					  })
+					  uni.navigateTo({
+						url: '../orderModule/index?type=1'
+					  })
+					}
+				  })
+				}).catch(err => {
+				  uni.hideLoading()
+				  uni.showToast({
+					title: '支付失败',
+					icon: 'none'
+				  })
+				  uni.navigateTo({
+					url: '../orderModule/index?type=1'
+				  })
+				})
+				// #endif
+			  }).catch(res => {
+				uni.hideLoading()
+				this.oneClickSubmit = true
+				uni.showToast({
+				  title: '提交失败',
+				  icon: 'none'
+				})
+			  })
+			} else {
+			  uni.showToast({
+				icon: 'none',
+				title: '请选择收货地址'
+			  })
             }
-            data.shops.push(shopsobj)
-            data.shops[n].distribution.distributionPrice = this.settlement.shops[n].distribution.distributionPrice
-            let dataskuslen = this.settlement.shops[n].skus.length
-            for (let m = 0; m < dataskuslen; m++) {
-              let skusobj = {}
-              skusobj["skuId"] = this.settlement.shops[n].skus[m].skuId
-              skusobj["number"] = this.settlement.shops[n].skus[m].number
-              skusobj["ifLogistics"] = this.settlement.shops[n].skus[m].ifLogistics
-              skusobj["selected"] = this.settlement.shops[n].skus[m].selected
-              skusobj["platformSeckillId"] = this.settlement.shops[n].skus[m].platformSeckillId
-              skusobj["platformDiscountId"] = this.settlement.shops[n].skus[m].platformDiscountId
-              skusobj["shopSeckillId"] = this.settlement.shops[n].skus[m].shopSeckillId
-              skusobj["shopDiscountId"] = this.settlement.shops[n].skus[m].shopDiscountId
-              skusobj["sceneId"] = this.settlement.shops[n].skus[m].sceneId
-              skusobj["priceId"] = this.settlement.shops[n].skus[m].priceId
-              skusobj["useMember"] = this.settlement.shops[n].skus[m].useMember
-              skusobj["composeId"] = this.settlement.shops[n].skus[m].composeId
-              // 积分传参
-              if (this.selectIntegral && this.settlement.creditDeductLimit !== 0 && this.totalprice > this.orderCreditThreshold && this.integralNum !== 0) {
-                let creditArr = this.settlement.skuCreditMap
-                for(let key in creditArr) {
-                  if (key == this.settlement.shops[n].skus[m].skuId) {
-                    if (this.settlement.shops[n].skus[m].ifCredit == 1) {
-                      if (this.integralNum !== 0) {
-                        if (this.settlement.shops[n].skus[m].creditLimit > this.integralNum) {
-                          skusobj["useCredit"] = this.integralNum
-                          skusobj["useCreditAmount"] = this.integralNum * this.integralRatio
-                          this.integralNum = 0
-                        } else {
-                          skusobj["useCredit"] = this.settlement.shops[n].skus[m].creditLimit
-                          skusobj["useCreditAmount"] = this.settlement.shops[n].skus[m].creditLimit * this.integralRatio
-                          this.integralNum = this.integralNum - this.settlement.shops[n].skus[m].creditLimit
-                        }
-                      } else {
-                        console.log('false')
-                        return false
-                      }
-                    }
-                  }
-                }
-              }
-              data.shops[n].skus.push(skusobj)
-            }
-          }
-          // #ifdef H5
-          data.paymentMode = 1
-          data.subPaymentMode = 3
-          // #endif
-
-          // #ifdef MP-WEIXIN
-          data.paymentMode = 1
-          data.subPaymentMode = 1
-          // #endif
-
-          // #ifdef APP-PLUS
-          data.paymentMode = 1
-          // #endif
-
-          // #ifdef MP-ALIPAY
-          data.paymentMode = 2
-          data.subPaymentMode = 1
-          // #endif
-
-          // uni.hideLoading()
-          console.log(this.settlement, '价格')
-          NET.request(API.PlaceOrder, data, 'POST').then(res => {
-            let submitResult = res.data
-            that.orderId = res.data.orderId
-            //console.log(submitResult, '测试')
-            submitResult.type = 1
-            submitResult.paymentMode = data.paymentMode
-            // #ifdef H5
-            let ua = navigator.userAgent.toLowerCase();
-            if (ua.match(/MicroMessenger/i) == "micromessenger") {
-            this.payRequest(submitResult)
-            }else{
-            NET.request(API.gotoH5Pay, submitResult, 'POST').then(res => {
-                //console.dir(res)
-                location.replace(res.data.mwebUrl)
-                // window.location.replace(url)
-              }).catch(err => {
-                this.submitActive = true
-                uni.hideLoading()
-                uni.showToast({
-                  title: '支付失败',
-                  icon: 'none'
-                })
-                uni.navigateTo({
-                  url: '../orderModule/index?type=1'
-                })
-              })
-           }
-            // #endif
-            // #ifdef MP-ALIPAY
-            submitResult.huabeiPeriod = this.huabeiPeriod
-            submitResult.paymentMode = this.paymentMode
-            this.aliPay(submitResult)
-            // #endif
-
-            // #ifdef MP-WEIXIN
-            NET.request(API.gotoPay, submitResult, 'POST').then(res => {
-              console.dir(res)
-              uni.requestPayment({
-                privider: 'wxpay',
-                timeStamp: res.data.timeStamp,
-                nonceStr: res.data.nonceStr,
-                package: res.data.package,
-                signType: res.data.signType,
-                paySign: res.data.paySign,
-                success: function(payRes) {
-                  uni.showToast({
-                    icon: 'none',
-                    title: '支付成功'
-                  })
-                  //console.log(submitResult.orderId, 'order Id')
-                  uni.navigateTo({
-                    url: 'paySuccessful?orderId=' + submitResult.orderId
-                  })
-                },
-                fail: function(err) {
-                  uni.showToast({
-                    icon: 'none',
-                    title: '支付取消'
-                  })
-                  uni.navigateTo({
-                    url: '../orderModule/index?type=1'
-                  })
-                }
-              })
-            }).catch(err => {
-              uni.hideLoading()
-              uni.showToast({
-                title: '支付失败',
-                icon: 'none'
-              })
-              uni.navigateTo({
-                url: '../orderModule/index?type=1'
-              })
-            })
-            // #endif
-            // #ifdef APP-PLUS
-            //console.log(submitResult, 'app-submitResult')
-            NET.request(API.gotoAppPay, submitResult, 'POST').then(res => {
-              let str = res.data.package
-              var index = str.lastIndexOf("\=");
-              str = str.substring(index+1,str.length);
-              var obj = {
-                appid: res.data.appId,
-                noncestr: res.data.nonceStr,
-                package: 'Sign=WXPay',
-                prepayid: str,
-                timestamp: res.data.timeStamp,
-                sign: 'MD5',
-                partnerid: res.data.partnerId
-              }
-              //console.log(res.data, '111')
-              //console.log(obj, '111')
-              uni.requestPayment({
-                provider: 'wxpay',
-                orderInfo: obj,
-                success: function(payRes) {
-                  uni.showToast({
-                    icon: 'none',
-                    title: '支付成功'
-                  })
-                  uni.navigateTo({
-                    url: 'paySuccessful?orderId=' + that.orderId
-                  })
-                },
-                fail: function(err) {
-                  //console.log(err)
-                  uni.showToast({
-                    icon: 'none',
-                    title: '支付取消'
-                  })
-                  uni.navigateTo({
-                    url: '../orderModule/index?type=1'
-                  })
-                }
-              })
-            }).catch(err => {
-              uni.hideLoading()
-              uni.showToast({
-                title: '支付失败',
-                icon: 'none'
-              })
-              uni.navigateTo({
-                url: '../orderModule/index?type=1'
-              })
-            })
-            // #endif
-          }).catch(res => {
-            uni.hideLoading()
-            uni.showToast({
-              title: '提交失败',
-              icon: 'none'
-            })
-          })
-        } else {
-          uni.showToast({
-            icon: 'none',
-            title: '请选择收货地址'
-          })
-        }
-      }
+        }else {
+			uni.showToast({
+				title:"已提交，请勿重新操作！",
+				icon:'none'
+			})
+		}
+	  }
     },
     // H5支付微信内置浏览器支付
     // #ifdef H5

pages_category_page1/orderModule/orderDetails.vue

@@ -1,15 +1,21 @@
 <!-- 订单详情 -->
 <template>
-	<view>
-		<view class="content" style="padding-bottom::200upx;">
+	<view v-if="ifShow">
+		<view class="content" style="padding-bottom:200upx;">
 			<view class="order-details-status">
 				<!--  待付款-->
 				<view class="status-title-box" v-if='dataList.state==1'>
 					<view class="l">
 						<text class="status">等待买家付款</text>
-						<text class="label">剩{{hou}}小时{{min}}分{{sec}}秒自动关闭</text>
+						<!-- <text class="label">剩{{hou}}小时{{min}}分{{sec}}秒自动关闭</text> -->
+						<view style="color: #FFFFFF; margin-top: 20rpx;">
+							<text>剩 </text>
+							<u-count-down :timestamp="remainingTime" fontSize="24rpx" :separator="zh" separatorColor="#FFFFFF"
+							separatorSize="24rpx"></u-count-down>
+							<text>自动关闭</text>
+						</view>
 					</view>
-<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifukuan.png"></image>-->
+					<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifukuan.png"></image>-->
 				</view>
 				<!--  待发货-->
 				<view class="status-title-box" v-else-if='dataList.state==2'>
@@ -17,7 +23,7 @@
 						<text class="status">等待卖家发货</text>
 						<text class="label">付款后2-5个工作日发货</text>
 					</view>
-<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifahuo.png"></image>-->
+					<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifahuo.png"></image>-->
 				</view>
 				<!--  待收货-->
 				<view class="status-title-box" v-else-if='dataList.state==3'>
@@ -25,7 +31,7 @@
 						<text class="status">卖家已发货</text>
 						<!-- <text class="label">还剩5天21小时自动确认</text> -->
 					</view>
-<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaishouhuo.png"></image>-->
+					<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaishouhuo.png"></image>-->
 				</view>
 				<!-- 已完成 -->
 				<view class="status-title-box" v-else-if='dataList.state==4'>
@@ -33,7 +39,7 @@
 						<text class="status">交易成功</text>
 						<text class="label">感谢您的使用</text>
 					</view>
-<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaipingjia.png"></image>-->
+					<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaipingjia.png"></image>-->
 				</view>
 				<!--  拼团失败-->
 				<view class="status-title-box" v-else-if='dataList.state==5 && dataList.collageId != 0'>
@@ -42,7 +48,7 @@
 						<text class="label">剩余时间 00:00:00</text>
 					</view>
 					<view class="clusterback">
-<!--						<image class='r' src="https://ceres.zkthink.com/static/images/staycluster.png"></image>-->
+						<!--						<image class='r' src="https://ceres.zkthink.com/static/images/staycluster.png"></image>-->
 					</view>
 				</view>
 				<!-- 交易关闭-->
@@ -60,9 +66,14 @@
 				<view class="status-title-box" v-else-if='dataList.state==6'>
 					<view class="l">
 						<text class="status">待成团</text>
-						<text class="label">剩余时间{{hou}}小时{{min}}分{{sec}}秒</text>
+						<!-- <text class="label">剩余时间{{hou}}小时{{min}}分{{sec}}秒</text> -->
+						<view style="color: #FFFFFF; margin-top: 20rpx;">
+							<text>剩余时间</text>
+							<u-count-down :timestamp="remainingTime" fontSize="24rpx" :separator="zh" separatorColor="#FFFFFF"
+							separatorSize="24rpx"></u-count-down>
+						</view>
 					</view>
-<!--					<image class='r' src="https://ceres.zkthink.com/static/images/clusterloss.png"></image>-->
+					<!--					<image class='r' src="https://ceres.zkthink.com/static/images/clusterloss.png"></image>-->
 				</view>
 
 			</view>
@@ -78,26 +89,30 @@
 							<text>{{dataList.receiveAdress}} {{dataList.address}}</text>
 						</view>
 					</view>
-					<image src="https://ceres.zkthink.com/static/images/arrowRight.png" v-if="false" class="arrow-right-img"></image>
+					<image src="https://ceres.zkthink.com/static/images/arrowRight.png" v-if="false"
+						class="arrow-right-img"></image>
 				</view>
 
 				<view class="order-list-box">
 					<view class="item">
 						<view class="order-list-top">
 							<view class="top-l" @click="goShop(dataList.shopId)">
-								<image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" class="shop-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png"
+									class="shop-img"></image>
 								<text class="shop-name">{{dataList.shopName}}</text>
-								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img">
+								</image>
 							</view>
 							<view class="toService" @click="openService">
-								<image src="https://ceres.zkthink.com/static/images/serviceImg-order-detail.png"  class="service-img" ></image>
+								<image src="https://ceres.zkthink.com/static/images/serviceImg-order-detail.png"
+									class="service-img"></image>
 								<text>联系客服</text>
 							</view>
 						</view>
 						<view class="order-info-box">
 							<view class="order-info">
-								<view class="order-info-item" v-for="proItem in dataList.skus"
-									:key="proItem.productId" @click="goodsItemTap(proItem.productId,proItem.skuId)">
+								<view class="order-info-item" v-for="proItem in dataList.skus" :key="proItem.productId"
+									@click="goodsItemTap(proItem.productId,proItem.skuId)">
 									<image :src="proItem.image" class="product-img"></image>
 									<view class="info-box">
 										<text class="product-name">{{proItem.productName}}</text>
@@ -110,11 +125,11 @@
 											<view class="product-num">x {{proItem.number}}</view>
 										</view>
 										<view class="price-sku-box">
-											<view class="price-box">
-												<view class="product-price1">实付：<text
-														class="fuhao">￥</text>{{proItem.price}}</view>
-												<!-- <view class="product-price2">价格：<text class="fuhao">￥</text>{{proItem.price}}</view> -->
-											</view>
+											<!--											<view class="price-box">-->
+											<!--												<view class="product-price1">实付：<text-->
+											<!--														class="fuhao">￥</text>{{proItem.price}}</view>-->
+											<!--												&lt;!&ndash; <view class="product-price2">价格：<text class="fuhao">￥</text>{{proItem.price}}</view> &ndash;&gt;-->
+											<!--											</view>-->
 
 											<view
 												v-if="(dataList.state === 3 || dataList.state === 4) && proItem.afterState == 0 && !proItem.returnType">
@@ -229,31 +244,32 @@
 				</view>
 			</view>
 
-      <view  v-if='dataList.state==3 || dataList.state==4'>
-			<view class="order-details-information mt20">
-				<view class="order-title-box" @click="wuLiuTap">
-					<view class="order-title padd-l">
-						<text class="line"></text>
-						<text>物流信息</text>
+			<view v-if='dataList.state==3 || dataList.state==4'>
+				<view class="order-details-information mt20">
+					<view class="order-title-box" @click="wuLiuTap">
+						<view class="order-title padd-l">
+							<text class="line"></text>
+							<text>物流信息</text>
+						</view>
+						<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png"
+							class="arrow-down-img" style="transform:rotate(180deg);" v-if="isShowWuLiu == true"></image>
+						<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png"
+							class="arrow-down-img" v-else>
+						</image>
 					</view>
-					<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png" class="arrow-down-img"
-						style="transform:rotate(180deg);" v-if="isShowWuLiu == true"></image>
-					<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png" class="arrow-down-img" v-else>
-					</image>
 				</view>
-			</view>
-			<!-- 暂无物流 -->
-			<view v-if="isShowWuLiu">
-				<view v-if="steps.length>0" class="logistics">
-					<uni-steps :options="steps" direction="column" :active="0"></uni-steps>
-				</view>
-				<view v-else class="emptyOrder-box flex-items-plus flex-column">
-					<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
-					<label class="font-color-999 fs26 mar-top-30">这里空空如也～</label>
+				<!-- 暂无物流 -->
+				<view v-if="isShowWuLiu">
+					<view v-if="steps.length>0" class="logistics">
+						<uni-steps :options="steps" direction="column" :active="0"></uni-steps>
+					</view>
+					<view v-else class="emptyOrder-box flex-items-plus flex-column">
+						<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
+						<label class="font-color-999 fs26 mar-top-30">这里空空如也～</label>
+					</view>
 				</view>
 			</view>
 		</view>
-    </view>
 
 		<!-- 待付款 待发货 待收货 已完成 退款成功 -->
 		<view class="order-details-btn" style="padding-top:30upx;"
@@ -340,7 +356,11 @@
 </template>
 
 <script>
+	import UCountDown from "../../uview-ui/components/u-count-down/u-count-down";
 	import ClipboardJS from "clipboard";
+	import {
+		hidden
+	} from "../../utils/hidden";
 	// #ifdef H5
 	var jweixin = require('jweixin-module')
 	// #endif
@@ -352,16 +372,17 @@
 	export default {
 		components: {
 			uniSteps,
+			UCountDown,
 		},
 		data() {
 			return {
 				canApplyIntervention: false,
 				dataList: {
-					orderFormid:null,
-					createTime:null,
-					orderPrice:0,
-					logisticsPrice:0,
-					discountPrice:0
+					orderFormid: null,
+					createTime: null,
+					orderPrice: 0,
+					logisticsPrice: 0,
+					discountPrice: 0
 				},
 				orderId: 0,
 				active: 0,
@@ -371,7 +392,7 @@
 				min: "00",
 				sec: "00",
 				timeOut: undefined,
-				Orderrefundlist: [],
+				orderRefundList: [],
 				item: {},
 				isIphone: false,
 				noticeId: 0,
@@ -390,7 +411,9 @@
 				// 客服
 				serviceURL: '',
 				corpId: '',
-				isLoading: false
+				isLoading: false,
+				ifShow: false,
+				remainingTime:null, //倒计时剩余时间
 			}
 		},
 		onLoad(options) {
@@ -412,6 +435,9 @@
 			}
 		},
 		onBackPress(e) {
+			if (e.from === 'backbutton') {
+				this.go(-1)
+			}
 			if (e.from === 'navigateBack') {
 				return false;
 			}
@@ -486,6 +512,8 @@
 					let data = res.data
 					this.dateformat(res.data.time)
 					this.dataList = data
+					this.dataList.receivePhone = hidden(this.dataList.receivePhone, 3, 4)
+					this.ifShow = true
 					console.log(this.dataList)
 					console.log(dataList.collageDetail.length, 888)
 					this.getShippingTrace(this.dataList.express, this.dataList.deliverFormid)
@@ -517,6 +545,7 @@
 				this.hou = hr
 				this.min = min
 				this.sec = sec
+				this.remainingTime = second
 			},
 			countDown() {
 				let timeOut = setTimeout(() => {
@@ -589,7 +618,7 @@
 			},
 			doDel() {
 				uni.showLoading({
-          mask: true,
+					mask: true,
 					title: '提交中...',
 				})
 				NET.request(API.DelOrder, {
@@ -658,7 +687,7 @@
 			},
 			doCancel() {
 				uni.showLoading({
-          mask: true,
+					mask: true,
 					title: '提交中...',
 				})
 				NET.request(API.CancelOrder, {
@@ -683,7 +712,7 @@
 				// #endif
 				// #ifndef MP-ALIPAY
 				uni.showLoading({
-          mask: true,
+					mask: true,
 					title: '订单提交中...',
 				})
 				// #endif
@@ -698,24 +727,24 @@
 				// if (ua.match(/MicroMessenger/i) == "micromessenger") {
 				// 	this.payRequest(submitResult)
 				// } else {
-					NET.request(API.gotoH5Pay, submitResult, 'POST').then(res => {
-						//console.dir(res)
-						location.replace(res.data.mwebUrl)
-						// window.location.replace(url)
-					}).catch(err => {
-						this.submitActive = true
-						uni.hideLoading()
-						uni.showToast({
-							title: '支付失败',
-							icon: 'none'
-						})
+				NET.request(API.gotoH5Pay, submitResult, 'POST').then(res => {
+					//console.dir(res)
+					location.replace(res.data.mwebUrl)
+					// window.location.replace(url)
+				}).catch(err => {
+					this.submitActive = true
+					uni.hideLoading()
+					uni.showToast({
+						title: '支付失败',
+						icon: 'none'
 					})
+				})
 				// }
 				// #endif
 				// #ifdef MP-WEIXIN
 				NET.request(API.gotoPay, submitResult, 'POST').then(res => {
 					uni.requestPayment({
-						privider: 'wxpay',
+						provider: 'wxpay',
 						timeStamp: res.data.timeStamp,
 						nonceStr: res.data.nonceStr,
 						package: res.data.package,
@@ -796,7 +825,7 @@
 			// 继续付款
 			continuePay() {
 				uni.showLoading({
-          mask: true,
+					mask: true,
 					title: '加载中...',
 				})
 				const payInfo = Object.assign({}, this.alipayInfo, {
@@ -959,19 +988,19 @@
 				NET.request(API.Orderrefund, {
 					orderId: this.orderId,
 				}, 'GET').then(res => {
-					this.Orderrefundlist = res.data
+					this.orderRefundList = res.data
 				}).catch(res => {})
 			},
 			//申请退款
 			applyMoneyAllTap() {
-				if (this.Orderrefundlist.length == 0) {
+				if (this.orderRefundList.length === 0) {
 					uni.showToast({
 						title: '您所有商品已经申请退款，请勿重复申请',
 						icon: 'none'
 					})
 					return
 				}
-				uni.setStorageSync('afterSaleApplyRefund', this.Orderrefundlist)
+				uni.setStorageSync('afterSaleApplyRefund', this.orderRefundList)
 				uni.navigateTo({
 					url: `afterSaleApplyRefund?orderId=${this.orderId}&sellPriceitem=${this.dataList.price}`,
 				})
@@ -1073,7 +1102,9 @@
 				})
 			},
 			openService() {
-				if (this.isLoading || !this.shopId || this.shopId === 'null') { return }
+				if (this.isLoading || !this.shopId || this.shopId === 'null') {
+					return
+				}
 				const shopids = uni.getStorageSync('service_shopids') || []
 				const corpIds = uni.getStorageSync('service_corpIds') || []
 				const urls = uni.getStorageSync('service_urls') || []
@@ -1115,7 +1146,9 @@
 				}
 			},
 			flyToService() {
-				if (!this.serviceURL || !this.corpId) { return }
+				if (!this.serviceURL || !this.corpId) {
+					return
+				}
 				// 获取店铺id、客服链接
 				const extInfo = { // 客服信息
 					url: this.serviceURL // 客服链接
@@ -1163,7 +1196,7 @@
 		justify-content: center;
 		padding: 40upx 30upx 0;
 		box-sizing: border-box;
-    text-align: center;
+		text-align: center;
 	}
 
 	.status-title-box2 {
@@ -1253,19 +1286,22 @@
 
 	.order-list-box {
 		margin-top: 20upx;
-		.toService{
+
+		.toService {
 			line-height: 40rpx;
 			padding: 0 8rpx;
 			border: 1rpx solid #FAF6ED;
 			cursor: pointer;
 			display: flex;
 			align-items: center;
-			.service-img{
+
+			.service-img {
 				width: 60upx;
 				height: 60upx;
 				margin-right: 12rpx;
 			}
-			text{
+
+			text {
 				line-height: 40rpx;
 			}
 		}
@@ -1444,7 +1480,7 @@
 
 	.order-total-box .way-color {
 		color: #333333;
-    font-size: 32rpx;
+		font-size: 32rpx;
 	}
 
 	.order-details-information {
@@ -1521,12 +1557,12 @@
 		text-align: center;
 		line-height: 100upx;
 		box-sizing: border-box;
-    margin-right: 10rpx;
+		margin-right: 10rpx;
 	}
 
 	.order-details-btn .btn-r {
 		width: 50%;
-    margin-left: 10rpx;
+		margin-left: 10rpx;
 	}
 
 	.mt20 {

pages_category_page1/orderModule/paySuccessful.vue

@@ -1,5 +1,8 @@
 <template>
   <view class="payCourteous">
+    <view class="payTitBox flex-items flex-center" :style="{'padding-top': topHeight + 'px'}">
+      <view class="payTit fs30">支付成功</view>
+    </view>
     <view class="resultCard">
       <view class="imgBox">
         <image src="https://ceres.zkthink.com/static/images/payIcon.png"></image>
@@ -18,10 +21,9 @@
             v-if="orderPolite.credit">
             恭喜获得额外积分<text class="growth">{{ orderPolite.credit }}</text>
           </view>
-		  <view class="growthBox"
-            v-if="orderPolite.growth">
-            恭喜获得额外会员成长值<text class="growth">{{ orderPolite.growth }}</text>
-          </view>
+		  <view class="growthBox" v-if="orderPolite.growth">
+        恭喜获得额外会员成长值<text class="growth">{{ orderPolite.growth }}</text>
+      </view>
           <view class="couponBox"
             v-for="(item, index) of orderPolite.couponList"
             :key="index"
@@ -54,9 +56,16 @@ export default {
   data() {
     return {
       orderId: null,
-      orderPolite: {}
+      orderPolite: {},
+      topHeight: 0
     }
   },
+  onShow() {
+    // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    this.topHeight = menuButtonInfo.top + 10
+    // #endif
+  },
   onLoad(option) {
     this.orderId = option.orderId
     if (this.orderId) {
@@ -95,6 +104,15 @@ export default {
 
 <style lang="scss" scoped>
 .payCourteous {
+  .payTitBox {
+    height: 100rpx;
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    background: #FFFFFF;
+    z-index: 99;
+  }
   .resultCard{
     padding: 200rpx 0 50rpx 0;
     .imgBox {

pages_category_page1/store/index.vue

@@ -5,7 +5,7 @@
 			<view class="shop-top" :style="{'padding-top': topHeight + 'px'}">
 				<image src="https://ceres.zkthink.com/static/images/back_img04.png" class="back" @click="back"></image>
         <view class="search-btn" @click="searchPro">
-          <image class="search-icon" src="https://ceres.zkthink.com/images/searchImg1.png" mode="widthFix"></image>
+          <image class="search-icon" src="https://ceres.zkthink.com/static/img/searchImg.png" mode="widthFix"></image>
           <text class="fs24 font-color-999 mar-left-10">请输入您想要的宝贝</text>
         </view>
 			</view>
@@ -176,11 +176,14 @@
 			canvasPage
 		},
 		onLoad(options) {
-            // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+      // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
       let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
       this.topHeight = menuButtonInfo.top
       console.log(this.topHeight, menuButtonInfo.top, 'fsfsfsfs')
-            // #endif
+      // #endif
+      // #ifdef APP
+      this.topHeight = 50
+      // #endif
       this.isIphone = getApp().globalData.isIphone;
 			if (getApp().globalData.shopShareItem) {
 				const item = getApp().globalData.shopShareItem
@@ -947,11 +950,11 @@ page {
 	width: 428rpx;
 	background: rgba(255, 255, 255, 0.1);
 	.search-icon {
-	  width: 50rpx;
-	  height: 50rpx;
-	   margin-left: 10rpx;
+	  width: 44rpx;
+	  height: 44rpx;
+    margin-left: 10rpx;
+    margin-top: 8rpx;
 	}
-
 	.search-word {
 	  font-size: 26rpx;
 	  font-weight: 400;
@@ -959,6 +962,11 @@ page {
 	  margin-left: 10rpx;
 	}
 }
+// #ifdef H5 || APP-PLUS
+.search-btn {
+  width: 100%;
+}
+// #endif
 // #ifdef MP-ALIPAY
 .back {
 	width: 25rpx;

pages_category_page2/channelCoupon/index.vue

@@ -28,7 +28,10 @@
             <text class="text">有效期</text>
             <text class="val">{{channelCouponData.startTime.slice(0,10)}} - {{channelCouponData.endTime.slice(0,10)}}</text>
           </view>
-          <view class="btn" @click="receiveCoupon(channelCouponData)">立即领取</view>
+          <view v-if="channelCouponData.state === 3" class="btn" @click="receiveCoupon(channelCouponData)">立即领取</view>
+          <view v-if="channelCouponData.state === 0" class="btn">已领取</view>
+          <view v-if="channelCouponData.state === 1" class="btn">已使用</view>
+          <view v-if="channelCouponData.state === 2" class="btn">已过期</view>
         </view>
       </view>
     </view>

pages_category_page2/livePage/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="live-list-page">
-		<view class="live-list" v-if="roomList.length">
+		<view class="live-list">
 			<LiveBox class="live-item"
 				v-for="item in roomList"
 				:key="item.roomid"
 				:liveData="item"
 			/>
 		</view>
-    <view v-else class="emptyCart-box">
+    <view v-if="ifShow" class="emptyCart-box">
       <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/collectEmpty.png"></image>
       <label class="text font-color-999 fs26 mar-top-30">暂无直播~</label>
     </view>
@@ -30,7 +30,8 @@ export default {
 				pageSize: 10,
 			},
 			isLoading: false,
-			roomList: []
+			roomList: [],
+      ifShow: false
 		}
 	},
 	onLoad() {
@@ -48,6 +49,9 @@ export default {
 			NET.request(API.LiveRoomes, this.page, 'get').then(res => {
 				if (this.page.page === 1) { // 第一次查询
 					this.roomList = res.data.list
+          if (this.roomList.length === 0) {
+            this.ifShow = true
+          }
 				} else { // 下拉继续查询
 					this.roomList = this.roomList.concat(res.data.list)
 				}

pages_category_page2/orderModule/refundDetails.vue

@@ -1,7 +1,7 @@
 <!-- 退货详情 -->
 <template>
-	<view>
-		<view class="">
+	<view v-if="ifShow">
+		<view>
 			<view class="order-details-status">
 				<view class="status-title-box" v-if='status == 1'>
 					<view class="l">
@@ -163,12 +163,12 @@
     <u-popup v-model="intervention" mode="center" border-radius="14" close-icon-pos="top-right"
              close-icon-size="20">
       <view class="interventionBox">
-        <view class="intTit">申请平台介入</view>
-        <textarea class="textarea-text" v-model="reason" placeholder-style="color:#BBBBBB" placeholder="请输入介入原因"/>
-        <view class="btnBox">
-          <button @click="interventionFn" class="primary">确定</button>
-          <button @click="closeInterventionFn">取消</button>
-        </view>
+        <view class="intTit">你已申请平台介入正在审核中...</view>
+<!--        <textarea class="textarea-text" v-model="reason" placeholder-style="color:#BBBBBB" placeholder="请输入介入原因"/>-->
+<!--        <view class="btnBox">-->
+<!--          <button @click="interventionFn" class="primary">确定</button>-->
+<!--          <button @click="closeInterventionFn">取消</button>-->
+<!--        </view>-->
       </view>
     </u-popup>
 	</view>
@@ -185,12 +185,12 @@
 				status:0,
 				deliveryfalse:false,
 				ReturnDetailData:[],
-        reason: '',
         images: '',
         intervention: false,
         interventionText: '',
         afterId: '',
-        orderId: ''
+        orderId: '',
+        ifShow: false
 			}
 		},
 		onLoad(options){
@@ -205,6 +205,7 @@
 				},'GET').then(res => {
 					this.status = res.data.afterState
 					this.itemlist = res.data
+          this.ifShow = true
 				}).catch(res => {
 
 				})
@@ -230,27 +231,8 @@
       },
       // 平台介入
       platform (afterId, orderId) {
-        this.intervention = true
-        this.afterId = afterId
-        this.orderId = orderId
-      },
-      interventionFn() {
-        uni.showLoading({
-          title:'正在申请介入...'
-        })
-        NET.request(API.platform, {
-          afterId: this.afterId,
-          orderId: this.orderId,
-          image: this.images,
-          reason: this.reason
-        }, 'POST').then(res => {
-          uni.hideLoading()
-          this.intervention = false
-          uni.showToast({
-            title:'申请成功',
-          })
-        }).catch(res => {
-          uni.hideLoading()
+        uni.navigateTo({
+          url:`../../pages_category_page1/orderModule/Intervene?afterId=${afterId}&orderId=${orderId}`
         })
       },
       closeInterventionFn() {

pages_category_page2/orderModule/returnDetails.vue

@@ -90,12 +90,12 @@
 				</view>
 			</view>
 
-			<view class="order-details-info-box mt20" v-if='status == 1'>
-				<view class="order-details-price">
+			<view class="order-details-info-box mt20">
+				<view class="order-details-price" v-if='status == 1'>
 					<text>退款总金额</text>
 					<text class="price-box"><text class="fuhao">￥</text>{{itemlist.price}}</text>
 				</view>
-			    <view class="address-box">
+			    <view class="address-box" v-if='status == 10'>
 			      <view>商家已同意退货申请，请尽早发货。</view>
 			      <view class="address-info">
 			        <image src="https://ceres.zkthink.com/static/images/expressSiteIcon.png" class="address-img"></image>

pages_category_page2/userModule/addAddress.vue

@@ -95,7 +95,7 @@ const API = require('../../config/api')
 				ssqText:'',
 				address:'',
 				tag:'',
-				ifDefault:false,
+				ifDefault: 0,
 				province:'',
 				city:'',
 				area:'',
@@ -139,7 +139,7 @@ const API = require('../../config/api')
               this.addressTagIndex = i
             }
           }
-          this.ifDefault = this.editAddress.defult
+          this.ifDefault = this.editAddress.ifDefault
           this.addressData.defaultRegion = this.ssqText.split("-")
           this.addressData.province = this.defaultRegion[0]
           this.addressData.city = this.defaultRegion[1]
@@ -228,7 +228,7 @@ const API = require('../../config/api')
 						receiveAdress: this.addressData.ssqText,
 						address:this.addressData.address,
 						label:this.tag,
-						defult:this.ifDefault
+            ifDefault:this.ifDefault ? 1 : 0
 					},'POST').then(res => {
 						uni.navigateBack({
 							delta: 1

pages_category_page2/userModule/address.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script>
+  import {hidden} from "../../utils/hidden";
 	const NET = require('../../utils/request')
 	const API = require('../../config/api')
 	export default {
@@ -121,6 +122,9 @@
 						this.addresList.list[i].username1 = this.addresList.list[i].receiveName.slice(0,1)
 					}
 					this.addresListlist = this.addresListlist.concat(res.data.list)
+          this.addresListlist.forEach((item) => {
+            item.receivePhone = hidden(item.receivePhone, 3, 4)
+          })
           if (this.addresList.length === 0) {
             this.ifEmpty = true
           }

pages_category_page2/userModule/collection.vue

@@ -1,72 +1,64 @@
 <template>
 	<view class="collection-box">
 		<view class="tabsbox">
-			<u-tabs
-				:list="collectionTypeList"
-				bar-width="60"
-				:bold="false"
-				active-color="#333333"
-				inactive-color="#CCCCCC"
-				:is-scroll="false"
-				:current="collectionTypeFlag"
-				@change="collectionTypeActive"
-			></u-tabs>
+			<u-tabs :list="collectionTypeList" bar-width="60" :bold="false" active-color="#333333"
+				inactive-color="#CCCCCC" :is-scroll="false" :current="collectionTypeFlag"
+				@change="collectionTypeActive"></u-tabs>
 		</view>
 		<view v-if="collectionTypeFlag == 0">
 			<view v-if="productCollect.length>0">
 				<view class="wid function-box">
 					<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 					<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
+						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+						</image>
 						<text class="mar-left-10">编辑</text>
 					</view>
 				</view>
 				<view class="swipe-box">
-          <view class="actionBox"
-						v-for="(item, index) in productCollect"
-						:key="item.collectId"
-						:index="index"
-					>
-            <u-swipe-action
-							ref="actionSwipe"
-							:show="item.show"
-							@open="productOpen(index)"
-							@click.stop="productActionClick"
-							:options="options"
-						>
-						<!-- :disabled="allCheckShow" -->
-              <view class="flex-item" @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)">
-                <view class="item wid flex-row-plus flex-display">
-                  <view class="flex-items selctBtn" v-show="allCheckShow">
-                    <image mode="aspectFill" v-if="item.selected == 1"
-                           @click.stop="productItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png"
-                           class="cart-select-img"></image>
-                    <image mode="aspectFill" v-else @click.stop="productItemSel(index,1)"
-                           src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
-                  </view>
-                  <view class="infoCent flex-items">
-                    <image class="product-img" mode="aspectFill" :src="item.image" />
-                    <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
-                    <view class="title-wrap mar-left-20 priceBox">
-                      <text class="title u-line-2 fs28 font-color-333">{{ item.productName }}</text>
-                      <view class="flex-items">
-												<image v-if="item.activityType" class="iconImg mar-right-10" :src="imgs[item.activityType]"></image>
-                        <text class="fs40 font-color-C83732">¥</text>
-                        <text class="fs40 font-color-C83732 mar-right-20">{{item.price}}</text>
-                        <text class="font-color-CCC discountsPriceLine fs24">¥{{item.originalPrice}}</text>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </u-swipe-action>
-          </view>
+					<view class="actionBox" v-for="(item, index) in productCollect" :key="item.collectId"
+						:index="index">
+						<u-swipe-action ref="actionSwipe" :show="item.show" @open="productOpen(index)"
+							@click="productActionClick" :options="options">
+							<!-- :disabled="allCheckShow" -->
+							<view class="flex-item" @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)">
+								<view class="item wid flex-row-plus flex-display">
+									<view class="flex-items selctBtn" v-show="allCheckShow">
+										<image mode="aspectFill" v-if="item.selected == 1"
+											@click.stop="productItemSel(index,0)"
+											src="https://ceres.zkthink.com/static/images/selectActive.png"
+											class="cart-select-img"></image>
+										<image mode="aspectFill" v-else @click.stop="productItemSel(index,1)"
+											src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+											class="cart-select-img"></image>
+									</view>
+									<view class="infoCent flex-items">
+										<image class="product-img" mode="aspectFill" :src="item.image" />
+										<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
+										<view class="title-wrap mar-left-20 priceBox">
+											<text
+												class="title u-line-2 fs28 font-color-333">{{ item.productName }}</text>
+											<view class="flex-items">
+												<image v-if="item.activityType" class="iconImg mar-right-10"
+													:src="imgs[item.activityType]"></image>
+												<text class="fs40 font-color-C83732">¥</text>
+												<text class="fs40 font-color-C83732 mar-right-20">{{item.price}}</text>
+												<text
+													class="font-color-CCC discountsPriceLine fs24">¥{{item.originalPrice}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</u-swipe-action>
+					</view>
 				</view>
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllProCheck" src="https://ceres.zkthink.com/static/images/selectActive.png"
-							class="cart-select-img" @click="allProductSel(0)"></image>
+						<image mode="aspectFill" v-if="isAllProCheck"
+							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+							@click="allProductSel(0)"></image>
 						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
 							class="cart-select-img" @click="allProductSel(1)"></image>
 						<text>全选</text>
@@ -86,59 +78,56 @@
 			<view v-if="storeCollect.length>0">
 				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
+					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+					</image>
 					<text class="mar-left-10">编辑</text>
 				</view>
 				<view class="swipe-box swipeBox">
-          <view
-						class="shopBox"
-						v-for="(item, index) in storeCollect"
-						:key="item.collectId"
-						:index="index"
-					>
-            <u-swipe-action
-							:show="item.show"
-							:options="options"
-							@click.stop="storeActionClick(index)"
-							@open="storeOpen(index)"
-						>
-              <view class="item wid flex-row-plus flex-display">
-                <view v-show="allCheckShow" class="selctBtn flex-items">
-                  <image mode="aspectFill" v-if="item.selected == 1"
-                         @click.stop="storeItemSel(index,0)"
-                         src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
-                  <image mode="aspectFill" v-else @click.stop="storeItemSel(index,1)"
-                         src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
-                </view>
-                <view class="infoCent">
-                  <view class="flex-row-plus flex-sp-between flex-items-plus wid">
-                    <view class="flex-items-plus flex-row pad-topbot-10">
-                      <image class="head-img" mode="aspectFill" :src="item.shopLogo" />
-                      <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
-                      <view class="title-wrap mar-left-20">
-                        <text class="title u-line-2 shopName">{{ item.shopName }}</text>
-                        <text class="font-color-CCC fs24">{{item.person}}人关注</text>
-                      </view>
-                    </view>
-                    <view class="toStore flex-items-plus fs24" @click="toStoreClick(item.shopId)">
-                      进入店铺
-                      <image src="https://ceres.zkthink.com/static/images/arrowR.png"></image>
-                    </view>
-                  </view>
-                  <view class="shopImgBox">
-                    <view class="itemImgBox" v-for="(sItem, sIndex) of item.productList" :key="sIndex" @click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
-                      <image :src="sItem.image"></image>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </u-swipe-action>
-          </view>
+					<view class="shopBox" v-for="(item, index) in storeCollect" :key="item.collectId" :index="index">
+						<u-swipe-action :show="item.show" :options="options" @click="storeActionClick(index)"
+							@open="storeOpen(index)">
+							<view class="item wid flex-row-plus flex-display">
+								<view v-show="allCheckShow" class="selctBtn flex-items">
+									<image mode="aspectFill" v-if="item.selected == 1"
+										@click.stop="storeItemSel(index,0)"
+										src="https://ceres.zkthink.com/static/images/selectActive.png"
+										class="cart-select-img"></image>
+									<image mode="aspectFill" v-else @click.stop="storeItemSel(index,1)"
+										src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+										class="cart-select-img"></image>
+								</view>
+								<view class="infoCent">
+									<view class="flex-row-plus flex-sp-between flex-items-plus wid">
+										<view class="flex-items-plus flex-row pad-topbot-10">
+											<image class="head-img" mode="aspectFill" :src="item.shopLogo" />
+											<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
+											<view class="title-wrap mar-left-20">
+												<text class="title u-line-2 shopName">{{ item.shopName }}</text>
+												<text class="font-color-CCC fs24">{{item.person}}人关注</text>
+											</view>
+										</view>
+										<view class="toStore flex-items-plus fs24" @click="toStoreClick(item.shopId)">
+											进入店铺
+											<image src="https://ceres.zkthink.com/static/images/arrowR.png"></image>
+										</view>
+									</view>
+									<view class="shopImgBox"  v-if="item.productList.length>0">
+										<view class="itemImgBox" v-for="(sItem, sIndex) of item.productList"
+											:key="sIndex"
+											@click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
+											<image :src="sItem.image"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</u-swipe-action>
+					</view>
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllStoreCheck" src="https://ceres.zkthink.com/static/images/selectActive.png"
-							class="cart-select-img" @click="allStoreSel(0)"></image>
+						<image mode="aspectFill" v-if="isAllStoreCheck"
+							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+							@click="allStoreSel(0)"></image>
 						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
 							class="cart-select-img" @click="allStoreSel(1)"></image>
 						<text>全选</text>
@@ -226,10 +215,10 @@
 				proCollectShow: false,
 				cardModal: false,
 				paoductDelSubmit: false,
-				shopDelSubmit:false,
-        ids: null,
-        currentIndex: null,
-        currentType: null
+				shopDelSubmit: false,
+				ids: null,
+				currentIndex: null,
+				currentType: null
 			};
 		},
 		onLoad() {
@@ -262,19 +251,19 @@
 						isShowProoductDelSubmit = true
 					}
 				})
-				if(isShowProoductDelSubmit === true){
+				if (isShowProoductDelSubmit === true) {
 					this.cardModal = true
 					this.paoductDelSubmit = true
 					this.shopDelSubmit = false
-				}else{
+				} else {
 					this.$u.toast(`请先选择要删除的收藏宝贝！`);
 				}
 			},
 			paoductDel() {
-        if (this.currentType === 1) {
-          this.cancelCollect(this.ids)
-          this.productCollect.splice(this.currentIndex, 1);
-        } else {
+				if (this.currentType === 1) {
+					this.cancelCollect(this.ids)
+					this.productCollect.splice(this.currentIndex, 1);
+				} else {
 					let ids = []
 					this.productCollect.forEach((value, index) => {
 						if (value.selected == 1) {
@@ -287,7 +276,7 @@
 						this.productCollect = []
 						this.cardModal = false
 						this.$u.toast(`删除成功`);
-            this.productPage = 1
+						this.productPage = 1
 						this.getProductCollect()
 					}).catch(res => {
 						this.cardModal = false
@@ -295,7 +284,7 @@
 					})
 				}
 			},
-			showCardModalshopDel(){
+			showCardModalshopDel() {
 				let isShowShopDelSubmit = false
 				// 店铺
 				this.storeCollect.forEach((value, index) => {
@@ -303,39 +292,39 @@
 						isShowShopDelSubmit = true
 					}
 				})
-				if(isShowShopDelSubmit === true ){
+				if (isShowShopDelSubmit === true) {
 					this.cardModal = true
 					this.shopDelSubmit = true
 					this.paoductDelSubmit = false
-				}else{
+				} else {
 					this.$u.toast(`请先选择要删除的收藏店铺！`);
 				}
 			},
 			shopDel() {
-        if (this.currentType === 2) {
-          this.cancelCollect(this.ids)
-          this.storeCollect.splice(this.currentIndex, 1);
-        } else {
-          console.log('删除')
-          let ids = []
-          this.storeCollect.forEach((value, index) => {
-            if (value.selected == 1) {
-              ids.push(value.collectId)
-            }
-          })
-          NET.request(API.deleteCollect, {
-            ids: ids
-          }, 'POST').then(res => {
-            this.storeCollect = []
-            this.cardModal = false
-            this.$u.toast(`删除成功`);
-            this.storePage = 1
-            this.getStoreCollect()
-          }).catch(res => {
-            this.cardModal = false
-            this.$u.toast(`删除失败`);
-          })
-        }
+				if (this.currentType === 2) {
+					this.cancelCollect(this.ids)
+					this.storeCollect.splice(this.currentIndex, 1);
+				} else {
+					console.log('删除')
+					let ids = []
+					this.storeCollect.forEach((value, index) => {
+						if (value.selected == 1) {
+							ids.push(value.collectId)
+						}
+					})
+					NET.request(API.deleteCollect, {
+						ids: ids
+					}, 'POST').then(res => {
+						this.storeCollect = []
+						this.cardModal = false
+						this.$u.toast(`删除成功`);
+						this.storePage = 1
+						this.getStoreCollect()
+					}).catch(res => {
+						this.cardModal = false
+						this.$u.toast(`删除失败`);
+					})
+				}
 			},
 			//去店铺
 			toStoreClick(storeId) {
@@ -366,11 +355,11 @@
 			},
 			storeClick(index, index1) {
 				if (index1 == 0) {
-          this.cardModal = true
-          this.shopDelSubmit = true
+					this.cardModal = true
+					this.shopDelSubmit = true
 					this.ids = this.storeCollect[index].collectId
-          this.currentIndex = index
-          this.currentType = 2
+					this.currentIndex = index
+					this.currentType = 2
 				}
 			},
 			// 如果打开一个的时候，不需要关闭其他，则无需实现本方法
@@ -388,6 +377,7 @@
 			},
 			// 打开删除层
 			productActionClick() {
+				console.log('打开')
 				this.cardModal = true
 				this.paoductDelSubmit = true
 				this.shopDelSubmit = false
@@ -462,16 +452,16 @@
 			},
 			//收藏商品查询
 			getProductCollect() {
-        uni.showLoading({
-          mask: true,
-          title: '加载中...'
-        })
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				})
 				NET.request(API.getProductCollect, {
 						page: this.productPage,
 						pageSize: this.productPageSize
 					},
 					'GET').then(res => {
-          uni.hideLoading()
+					uni.hideLoading()
 					if (res.data.list.length == 0) {
 						this.proCollectShow = true
 						this.proloadingType = 1
@@ -493,16 +483,16 @@
 			},
 			//收藏店铺查询
 			getStoreCollect() {
-        uni.showLoading({
-          mask: true,
-          title: '加载中...'
-        })
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				})
 				NET.request(API.getStoreCollect, {
 						page: this.storePage,
 						pageSize: this.storePageSize
 					},
 					'GET').then(res => {
-          uni.hideLoading()
+					uni.hideLoading()
 					if (res.data.list.length == 0) {
 						this.storeCollectShow = true
 						this.storeloadingType = 1
@@ -525,14 +515,14 @@
 				NET.request(API.cancelCollect, {
 					ids: [ids]
 				}, 'POST').then(res => {
-          this.$u.toast(`删除成功`);
-          this.cardModal = false
-          this.currentType = null
-          this.currentIndex  = null
-          this.ids = null
+					this.$u.toast(`删除成功`);
+					this.cardModal = false
+					this.currentType = null
+					this.currentIndex = null
+					this.ids = null
 					if (res.code == "200") {
-            this.productCollect = []
-            this.storeCollect = []
+						this.productCollect = []
+						this.storeCollect = []
 						this.getStoreCollect()
 						this.getProductCollect()
 					} else {
@@ -545,12 +535,13 @@
 					})
 				})
 			},
-      //商品详情
-      goodsDateils(shopId,productId,skuId){
-        uni.navigateTo({
-          url: '/pages_category_page1/goodsModule/goodsDetails?shopId='+shopId + '&productId='+productId +'&skuId='+skuId
-        })
-      }
+			//商品详情
+			goodsDateils(shopId, productId, skuId) {
+				uni.navigateTo({
+					url: '/pages_category_page1/goodsModule/goodsDetails?shopId=' + shopId + '&productId=' +
+						productId + '&skuId=' + skuId
+				})
+			}
 		}
 	}
 </script>
@@ -606,35 +597,43 @@
 		}
 
 		.swipe-box {
-      padding: 0 20rpx;
-      .actionBox {
-        margin-bottom: 20rpx;
-      }
+			padding: 0 20rpx;
+
+			.actionBox {
+				margin-bottom: 20rpx;
+			}
+
 			.item {
 				display: flex;
-        .infoCent {
-          padding: 20rpx;
-        }
-        .selctBtn {
-          background: #F7F7F7;
-        }
+
+				.infoCent {
+					padding: 20rpx;
+				}
+
+				.selctBtn {
+					background: #F7F7F7;
+				}
+			}
+
+			.shopImgBox {
+				display: flex;
+				justify-content: end;
+				margin-left: 90rpx;
+				padding-bottom: 20rpx;
+				margin-top: 20rpx;
+
+				.itemImgBox {
+					margin-right: 15rpx;
+					margin-left: 5rpx;
+
+					image {
+						width: 120rpx;
+						height: 120rpx;
+						border: 2rpx solid #F3F4F5;
+					}
+				}
 			}
-      .shopImgBox {
-        display: flex;
-        justify-content: end;
-        margin-left: 90rpx;
-        padding-bottom: 20rpx;
-        margin-top: 20rpx;
-        .itemImgBox {
-          margin-right: 15rpx;
-          margin-left: 5rpx;
-          image {
-            width: 120rpx;
-            height: 120rpx;
-            border: 2rpx solid #F3F4F5;
-          }
-        }
-      }
+
 			.product-img {
 				width: 220rpx;
 				flex: 0 0 220rpx;
@@ -652,16 +651,18 @@
 				text-align: left;
 				font-size: 28rpx;
 				color: $u-content-color;
-        height: 165rpx;
-        padding-right: 20rpx;
+				height: 165rpx;
+				padding-right: 20rpx;
+			}
+
+			.shopName {
+				height: auto;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				width: 340rpx;
 			}
-      .shopName {
-        height: auto;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        width: 340rpx;
-      }
+
 			.cart-select-img {
 				width: 40upx;
 				height: 40upx;
@@ -670,20 +671,23 @@
 			}
 
 			.toStore {
+				width: 100px;
 				color: #FFEBC4;
 				padding: 0rpx 20rpx;
 				height: 52rpx;
 				background: #333333;
 				margin-right: 15rpx;
+
 				image {
 					width: 10rpx;
 					height: 18rpx;
 					margin-left: 10rpx;
 				}
 			}
-      .shopBox {
-        margin-bottom: 20rpx;
-      }
+
+			.shopBox {
+				margin-bottom: 20rpx;
+			}
 		}
 
 		.allcheck-box {
@@ -746,27 +750,31 @@
 			position: absolute;
 			bottom: -50px;
 			left: 45%;
+
 			image {
 				width: 60upx;
 				height: 60upx;
 			}
 		}
 	}
-  .priceBox {
-    .iconImg {
-      width: 58rpx;
-      height: 36rpx;
-      margin-right: 10rpx;
-    }
-  }
+
+	.priceBox {
+		.iconImg {
+			width: 58rpx;
+			height: 36rpx;
+			margin-right: 10rpx;
+		}
+	}
 </style>
 <style scoped>
 	.tabsbox /deep/ #u-tab-item-0 {
 		position: relative;
 	}
-  .tabsbox /deep/ .u-tab-bar {
-    background-color: #c5aa7b !important;
-  }
+
+	.tabsbox /deep/ .u-tab-bar {
+		background-color: #c5aa7b !important;
+	}
+
 	.tabsbox /deep/ #u-tab-item-0::before {
 		content: '';
 		width: 2rpx;
@@ -793,7 +801,7 @@
 	}
 </style>
 <style>
-page {
-  background-color: #F7F7F7;
-}
+	page {
+		background-color: #F7F7F7;
+	}
 </style>

pages_category_page2/userModule/coupon.vue

@@ -109,7 +109,7 @@
   flex-direction: row;
   position: relative;
   background-size: contain;
-  padding: 0 60rpx;
+  padding: 0 56rpx;
   margin-bottom: 30rpx;
 }
 

pages_category_page2/userModule/login.vue

@@ -76,6 +76,10 @@
 			},
 			// 微信登录
 			GetUserInfo() {
+        uni.showLoading({
+          title: '正在加载...',
+          mask: true
+        });
 				const that = this
 				// // #ifdef APP-PLUS
 				// uni.login({
@@ -114,6 +118,7 @@
 				uni.login({
 					provider: 'weixin',
 					success: (res2) => {
+            uni.hideLoading()
 						that.WXloginQuery.code = res2.code
 					},
 					fail: () => {

pages_category_page2/userModule/memberAccount.vue

@@ -1,6 +1,6 @@
 <!-- 我的账户 -->
 <template>
-	<view class="container">
+	<view class="container" v-if="ifShow">
 		<view class="balance">
 		</view>
     <view class="balanceInfo">
@@ -26,7 +26,8 @@
 	export default {
 		data() {
 			return {
-				accountInfo:[]
+				accountInfo:[],
+        ifShow: false
 			}
 		},
 		onShow() {
@@ -47,7 +48,13 @@
 			},
 			getBalance(){
 				const _ = this
+        uni.showLoading({
+          mask: true,
+          title: '加载中...'
+        })
 				NET.request(API.GetDistributor,{},"GET").then(res => {
+          uni.hideLoading()
+          this.ifShow = true
 					_.accountInfo = res.data
 				}).catch(res => {
 

pages_category_page2/userModule/messageCenter.vue

@@ -69,11 +69,13 @@
         ifEmpty: false
 			}
 		},
-		onShow() {
-			this.page = 1
-			this.messageList = []
-			this.getAllMessage()
-			this.GetUser()
+    onShow() {
+      this.page = 1
+      this.messageList = []
+      this.getAllMessage()
+      this.GetUser()
+    },
+		onLoad() {
 		},
 		onReachBottom() {
 			if (this.loadingType == 1) {
@@ -88,7 +90,7 @@
 				NET.request(API.GetUser, {}, 'GET').then(res => {
 					this.num = res.data.notRead
 				}).catch(res => {
-			
+
 				})
 			},
 			parseText(html) {
@@ -123,8 +125,7 @@
 					'page': this.page,
 					'pageSize': this.pageSize
 				}, 'GET').then(res => {
-
-					uni.hideLoading()
+          uni.hideLoading()
 					if (res.data.length == 0) {
 						this.loadingType = 1
 						this.page = this.page

pages_category_page2/userModule/messageDetail.vue

@@ -22,9 +22,12 @@
 				htmlData: []
 			}
 		},
+		onShow() {
+			this.getNotice()
+		},
 		onLoad(options) {
 			this.onlyid = options.noticeId
-      this.getNotice()
+            this.getNotice()
 		},
 		methods: {
 			formatRichText(html) {
@@ -71,8 +74,10 @@
         NET.request(API.readNotice, {
           noticeId: this.onlyid
         }, 'POST').then(res => {
+			uni.hideLoading()
           this.gitMassageDateils()
         }).catch(res => {
+			uni.hideLoading()
           uni.showToast({
             title: '失败',
             icon: "none"

pages_category_page2/userModule/questionList.vue

@@ -1,42 +1,46 @@
 <template>
 	<view class="question-box">
 		<view class="tabsbox">
-			<u-tabs :list="questionTypeList" bar-width="140" :bold="false" active-color="#C5AA7B" inactive-color="#999999"
-			 :is-scroll="false" :current="questionTypeFlag" @change="questionTypeActive"></u-tabs>
+			<u-tabs :list="questionTypeList" bar-width="140" :bold="false" active-color="#C5AA7B"
+				inactive-color="#999999" :is-scroll="false" :current="questionTypeFlag" @change="questionTypeActive">
+			</u-tabs>
 		</view>
 		<view v-if="questionTypeFlag == 0">
 			<view>
 				<view class="wid function-box">
 					<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 					<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
+						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+						</image>
 						<text class="mar-left-10">编辑</text>
 					</view>
 				</view>
 				<view class="swipe-box">
-					<u-swipe-action :show="item.show" :index="index"
-						v-for="(item, index) in problemList" :key="item.problemId"
-						@click="problemClick" @open="problemOpen"
-						:options="options"
-					>
+					<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in problemList"
+						:key="item.problemId" @click="problemClick" @open="problemOpen" :options="options">
 						<view class="flex-item itemBox" @click="goQuestionDetails(item.productId,item.problemId)">
 							<view class="item u-border-bottom wid flex-row-plus flex-items">
 								<view v-show="allCheckShow">
-									<image mode="aspectFill" v-if="item.selected == 1" @click.stop="problemItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
-									<image mode="aspectFill" v-else @click.stop="problemItemSel(index,1)" src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
+									<image mode="aspectFill" v-if="item.selected == 1"
+										@click.stop="problemItemSel(index,0)"
+										src="https://ceres.zkthink.com/static/images/selectActive.png"
+										class="cart-select-img"></image>
+									<image mode="aspectFill" v-else @click.stop="problemItemSel(index,1)"
+										src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+										class="cart-select-img"></image>
 								</view>
-<!--								<image class="product-img" mode="aspectFill" :src="item.image" />-->
+								<!--								<image class="product-img" mode="aspectFill" :src="item.image" />-->
 								<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 								<view class="title-wrap replynum-box">
-                  <view class="flex-items">
-                    <label>问</label>
-                    <text class="title u-line-2 font-weight-bold fs28">{{ item.problem }}</text>
-                  </view>
-                  <view class="flex-items reply">
-                    <label>答</label>
-                    <text class="font-color-666 fs24" v-if="item.count>0">{{item.count}}条回复</text>
-                    <text  class="font-color-666 fs24" v-else>暂无回复</text>
-                  </view>
+									<view class="flex-items">
+										<label>问</label>
+										<text class="title u-line-2 font-weight-bold fs28">{{ item.problem }}</text>
+									</view>
+									<view class="flex-items reply">
+										<label>答</label>
+										<text class="font-color-666 fs24" v-if="item.count>0">{{item.count}}条回复</text>
+										<text class="font-color-666 fs24" v-else>暂无回复</text>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -45,8 +49,11 @@
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllProblemCheck" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click="allProblemSel(0)"></image>
-						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click="allProblemSel(1)"></image>
+						<image mode="aspectFill" v-if="isAllProblemCheck"
+							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+							@click="allProblemSel(0)"></image>
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+							class="cart-select-img" @click="allProblemSel(1)"></image>
 						<text>全选</text>
 					</view>
 					<view class="right">
@@ -64,38 +71,48 @@
 			<view>
 				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
+					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+					</image>
 					<text class="mar-left-10">编辑</text>
 				</view>
 				<view class="swipe-box">
-					<u-swipe-action :show="item.show" :index="index"
-						v-for="(item, index) in answerList" :key="item.answerId"
-						@click="answerClick" @open="answerOpen"
-						:options="options"
-					>
-						<view class="item itemBox u-border-bottom flex-item" @click="goQuestionDetails(item.productId,item.problemId)">
+					<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in answerList"
+						:key="item.answerId" @click="answerClick" @open="answerOpen" :options="options">
+						<view class="item itemBox u-border-bottom flex-item"
+							@click="goQuestionDetails(item.productId,item.problemId)">
 							<view class="wid" style="border-radius: 50%;">
 								<view class="flex-items-plus flex-row wid">
 									<view v-show="allCheckShow">
-										<image mode="aspectFill" v-if="item.selected == 1" @click.stop="answerItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
-										<image mode="aspectFill" v-else @click.stop="answerItemSel(index,1)" src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
+										<image mode="aspectFill" v-if="item.selected == 1"
+											@click.stop="answerItemSel(index,0)"
+											src="https://ceres.zkthink.com/static/images/selectActive.png"
+											class="cart-select-img"></image>
+										<image mode="aspectFill" v-else @click.stop="answerItemSel(index,1)"
+											src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+											class="cart-select-img"></image>
 									</view>
-<!--									<image class="product-img" mode="aspectFill" :src="item.image" />-->
+									<!--									<image class="product-img" mode="aspectFill" :src="item.image" />-->
 									<view class="title-wrap replynum-box wid">
-                    <view class="flex-items">
-                      <label>问</label>
-                      <text class="title u-line-2 fs28 font-weight-bold">{{ item.problem }}</text>
-                    </view>
+										<view class="flex-items">
+											<label>问</label>
+											<text class="title u-line-2 fs28 font-weight-bold">{{ item.problem }}</text>
+										</view>
 										<view class="replyBox">
-                      <view class="flex-items reply">
-                        <label>答</label>
-                        <text v-if="allCheckShow" style="width: 270rpx;" class="font-color-666 fs24 overflow">{{item.name}} : {{item.answer}}</text>
-                        <text v-else style="width: 360rpx;" class="font-color-999 fs24 overflow">{{item.name}} : {{item.answer}}</text>
-                      </view>
-                      <view class="qAarrow mar-top-30 flex-items">
-                        <text class="fs24 font-color-C5AA7B">共{{item.count}}个回答</text>
-                        <image class="item-btn-right" src="https://ceres.zkthink.com/static/img/user/arrow.png" mode="widthFix"></image>
-                      </view>
+											<view class="flex-items reply">
+												<label>答</label>
+												<text v-if="allCheckShow" style="width: 270rpx;"
+													class="font-color-666 fs24 overflow">{{item.name}} :
+													{{item.answer}}</text>
+												<text v-else style="width: 360rpx;"
+													class="font-color-999 fs24 overflow">{{item.name}} :
+													{{item.answer}}</text>
+											</view>
+											<view class="qAarrow mar-top-30 flex-items">
+												<text class="fs24 font-color-C5AA7B">共{{item.count}}个回答</text>
+												<image class="item-btn-right"
+													src="https://ceres.zkthink.com/static/img/user/arrow.png"
+													mode="widthFix"></image>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -106,8 +123,11 @@
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllAnswerCheck" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click="allAnswerSel(0)"></image>
-						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click="allAnswerSel(1)"></image>
+						<image mode="aspectFill" v-if="isAllAnswerCheck"
+							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+							@click="allAnswerSel(0)"></image>
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+							class="cart-select-img" @click="allAnswerSel(1)"></image>
 						<text>全选</text>
 					</view>
 					<view class="right">
@@ -158,7 +178,7 @@
 	const NET = require('../../utils/request')
 	const API = require('../../config/api')
 	export default {
-		components:{
+		components: {
 			tuiModal
 		},
 		data() {
@@ -172,84 +192,83 @@
 				disabled: false,
 				btnWidth: 180,
 				show: false,
-				options: [
-					{
-						text: ' ',
-						style: {
-							backgroundColor: '#C83732'
-						}
+				options: [{
+					text: ' ',
+					style: {
+						backgroundColor: '#C83732'
 					}
-				],
-				isAllProblemCheck:false,
-				isAllAnswerCheck:false,
-				allCheckShow:false,
-				delshow:false,
-				problemPage:1,
-				problemPageSize:10,
-				proloadingType:0,
-				problemList:[],
-				answerList:[],
-				answerPage:1,
-				answerPageSize:10,
-				answerloadingType:0,
-				delType:0,
-        ifEmpty: false
+				}],
+				isAllProblemCheck: false,
+				isAllAnswerCheck: false,
+				allCheckShow: false,
+				delshow: false,
+				problemPage: 1,
+				problemPageSize: 10,
+				proloadingType: 0,
+				problemList: [],
+				answerList: [],
+				answerPage: 1,
+				answerPageSize: 10,
+				answerloadingType: 0,
+				delType: 0,
+				ifEmpty: false
 			};
 		},
 		onLoad() {
 			this.getProblemList()
+			this.getAnswerList()
 		},
-		onReachBottom(){
-			if(this.questionTypeFlag == 0){
-				if(this.proloadingType == 1){
+		onReachBottom() {
+			if (this.questionTypeFlag == 0) {
+				if (this.proloadingType == 1) {
 					uni.stopPullDownRefresh()
-				}else{
-					this.problemPage = this.problemPage+1
+				} else {
+					this.problemPage = this.problemPage + 1
 					this.getProblemList()
 				}
-			}else if(this.questionTypeFlag == 1){
-				if(this.answerloadingType == 1){
+			} else if (this.questionTypeFlag == 1) {
+				if (this.answerloadingType == 1) {
 					uni.stopPullDownRefresh()
-				}else{
-					this.answerPage = this.answerPage+1
+				} else {
+					this.answerPage = this.answerPage + 1
 					this.getAnswerList()
 				}
 			}
 		},
-		methods:{
-			goQuestionDetails(productId,problemId){
+		methods: {
+			goQuestionDetails(productId, problemId) {
 				let data = {
-					  productId:productId,
-					  problemId:problemId
+					productId: productId,
+					problemId: problemId
 				}
-				uni.setStorageSync("seeAllFnData",data)
+				uni.setStorageSync("seeAllFnData", data)
 				uni.navigateTo({
-					url:'../../pages_category_page1/goodsModule/qADetail'
+					url: '../../pages_category_page1/goodsModule/qADetail'
 				})
 			},
 			//确定批量删除
-			delClick(){
+			delClick() {
 				this.delshow = false
-				if(this.delType == 0){
+				if (this.delType == 0) {
 					this.problemPage = 1
 					this.problemPageSize = 10
 					this.problemDel()
-				}else if(this.delType == 1){
-					this.answerPage=1
-					this.answerPageSize=10
+				} else if (this.delType == 1) {
+					this.answerPage = 1
+					this.answerPageSize = 10
 					this.answerDel()
 				}
 			},
 			//批量删除
-			problemDel(){
+			problemDel() {
 				let ids = []
-				this.problemList.forEach((value,index)=>{
-					if(value.selected == 1){
+				this.problemList.forEach((value, index) => {
+					if (value.selected == 1) {
 						ids.push(value.problemId)
 					}
 				})
-				NET.request(API.deleteProblem,{
-					ids:ids
+				NET.request(API.deleteProblem, {
+					ids: ids
 				}, 'POST').then(res => {
 					this.problemList = []
 					this.$u.toast(`删除成功`);
@@ -258,15 +277,15 @@
 					this.$u.toast(`删除失败`);
 				})
 			},
-			answerDel(){
+			answerDel() {
 				let ids = []
-				this.answerList.forEach((value,index)=>{
-					if(value.selected == 1){
+				this.answerList.forEach((value, index) => {
+					if (value.selected == 1) {
 						ids.push(value.answerId)
 					}
 				})
-				NET.request(API.deleteAnswer,{
-					ids:ids
+				NET.request(API.deleteAnswer, {
+					ids: ids
 				}, 'POST').then(res => {
 					this.answerList = []
 					this.$u.toast(`删除成功`);
@@ -276,215 +295,211 @@
 				})
 			},
 			//全选
-			allProblemSel(type){
+			allProblemSel(type) {
 				this.isAllProblemCheck = !this.isAllProblemCheck
-				this.problemList.forEach((value,index)=>{
+				this.problemList.forEach((value, index) => {
 					this.problemList[index].selected = type
 				})
 			},
-			allAnswerSel(type){
+			allAnswerSel(type) {
 				this.isAllAnswerCheck = !this.isAllAnswerCheck
-				this.answerList.forEach((value,index)=>{
+				this.answerList.forEach((value, index) => {
 					this.answerList[index].selected = type
 				})
 			},
 			//单个选中
-			problemItemSel(index,number){
+			problemItemSel(index, number) {
 				this.problemList[index].selected = number
 				let proSelectNum = 0
-				this.problemList.forEach((value,index)=>{
-					if(this.problemList[index].selected == 0){
+				this.problemList.forEach((value, index) => {
+					if (this.problemList[index].selected == 0) {
 						this.isAllProblemCheck = false
-					}else{
+					} else {
 						proSelectNum++
 					}
 				})
-				if(this.problemList.length == proSelectNum){
+				if (this.problemList.length == proSelectNum) {
 					this.isAllProblemCheck = true
 				}
 			},
-			answerItemSel(index,number){
+			answerItemSel(index, number) {
 				this.answerList[index].selected = number
 				let ansSelectNum = 0
-				this.answerList.forEach((value,index)=>{
-					if(this.answerList[index].selected == 0){
+				this.answerList.forEach((value, index) => {
+					if (this.answerList[index].selected == 0) {
 						this.isAllAnswerCheck = false
-					}else{
+					} else {
 						ansSelectNum++
 					}
 				})
-				if(this.answerList.length == ansSelectNum){
+				if (this.answerList.length == ansSelectNum) {
 					this.isAllAnswerCheck = true
 				}
 			},
-			problemClick(index, index1){
-				if(index1 == 0) {
+			problemClick(index, index1) {
+				if (index1 == 0) {
 					let ids = this.problemList[index].problemId
 					this.cancelProblem(ids)
 					this.problemList.splice(index, 1);
 					this.$u.toast(`删除成功`);
 				}
 			},
-			answerClick(index, index1){
-				if(index1 == 0) {
+			answerClick(index, index1) {
+				if (index1 == 0) {
 					let ids = this.answerList[index].answerId
 					this.cancelAnswer(ids)
 					this.answerList.splice(index, 1);
 					this.$u.toast(`删除成功`);
 				}
 			},
-			problemOpen(index){
+			problemOpen(index) {
 				this.problemList[index].show = true;
 				this.problemList.map((val, idx) => {
-					if(index != idx) this.problemList[idx].show = false;
+					if (index != idx) this.problemList[idx].show = false;
 				})
 			},
-			answerOpen(index){
+			answerOpen(index) {
 				this.answerList[index].show = true;
 				this.answerList.map((val, idx) => {
-					if(index != idx) this.answerList[idx].show = false;
+					if (index != idx) this.answerList[idx].show = false;
 				})
 			},
 			//删除提问
-			cancelProblem(ids){
-				NET.request(API.deleteProblem,{
-					ids:[ids]
-				}, 'POST').then(res => {
-				}).catch(res => {
+			cancelProblem(ids) {
+				NET.request(API.deleteProblem, {
+					ids: [ids]
+				}, 'POST').then(res => {}).catch(res => {
 					uni.showToast({
-						title:'失败',
-						icon:"none"
+						title: '失败',
+						icon: "none"
 					})
 				})
 			},
 			//删除回答
-			cancelAnswer(ids){
-				NET.request(API.deleteAnswer,{
-					ids:[ids]
-				}, 'POST').then(res => {
-				}).catch(res => {
+			cancelAnswer(ids) {
+				NET.request(API.deleteAnswer, {
+					ids: [ids]
+				}, 'POST').then(res => {}).catch(res => {
 					uni.showToast({
-						title:'失败',
-						icon:"none"
+						title: '失败',
+						icon: "none"
 					})
 				})
 			},
 			//我的提问列表
-			getProblemList(){
-        uni.showLoading({
-          mask: true,
-          title: '加载中...',
-        })
-				NET.request(API.getProblemList,
-				{
-					page:this.problemPage,
-					pageSize:this.problemPageSize
-				},
-				'GET').then(res => {
-          uni.hideLoading()
+			getProblemList() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中...',
+				})
+				NET.request(API.getProblemList, {
+						page: this.problemPage,
+						pageSize: this.problemPageSize
+					},
+					'GET').then(res => {
+					uni.hideLoading()
 					let total = res.data.total
-					this.questionTypeList[0].name = '我的提问('+ total +')'
-					if(res.data.list.length == 0){
+					this.questionTypeList[0].name = '我的提问(' + total + ')'
+					if (res.data.list.length == 0) {
 						this.proloadingType = 1
 						this.problemPage = this.problemPage
-					}else{
+					} else {
 						this.problemList = this.problemList.concat(res.data.list)
 					}
-          if (this.problemList.length === 0) {
-            this.ifEmpty = true
-          }
+					if (this.problemList.length === 0) {
+						this.ifEmpty = true
+					}
 				}).catch(res => {
 					uni.showToast({
-						title:'我的提问查询失败',
-						icon:"none"
+						title: '我的提问查询失败',
+						icon: "none"
 					})
 				})
 			},
 			//我的回答列表
-			getAnswerList(){
-        uni.showLoading({
-          mask: true,
-          title: '加载中...',
-        })
-				NET.request(API.getAnswerList,
-				{
-					page:this.answerPage,
-					pageSize:this.answerPageSize
-				},
-				'GET').then(res => {
-          uni.hideLoading()
+			getAnswerList() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中...',
+				})
+				NET.request(API.getAnswerList, {
+						page: this.answerPage,
+						pageSize: this.answerPageSize
+					},
+					'GET').then(res => {
+					uni.hideLoading()
 					let total = res.data.total
-					this.questionTypeList[1].name = '我的回答('+ total +')'
-					if(res.data.list.length == 0){
+					this.questionTypeList[1].name = '我的回答(' + total + ')'
+					if (res.data.list.length == 0) {
 						this.answerloadingType = 1
 						this.answerPage = this.answerPage
-					}else{
+					} else {
 						this.answerList = this.answerList.concat(res.data.list)
 					}
-          if (this.answerList.length === 0) {
-            this.ifEmpty = true
-          }
+					if (this.answerList.length === 0) {
+						this.ifEmpty = true
+					}
 				}).catch(res => {
 					uni.showToast({
-						title:'失败',
-						icon:"none"
+						title: '失败',
+						icon: "none"
 					})
 				})
 			},
 			questionTypeActive(index) {
-        this.ifEmpty = false
+				this.ifEmpty = false
 				this.questionTypeFlag = index
-				if(index==0){
+				if (index == 0) {
 					this.problemPage = 1
 					this.problemList = []
 					this.proloadingType = 0
 					this.getProblemList()
-				}else if(index==1){
+				} else if (index == 1) {
 					this.answerPage = 1
 					this.answerList = []
 					this.answerloadingType = 0
 					this.getAnswerList()
 				}
 			},
-			editClick(){
+			editClick() {
 				this.allCheckShow = true
 			},
-			finishClick(){
+			finishClick() {
 				this.allCheckShow = false
 			},
-			cancelClick(){
+			cancelClick() {
 				this.delshow = false
 			},
-			questionDel(num){
+			questionDel(num) {
 				let quNum = 0
 				let anNum = 0
-				this.problemList.forEach((value,index)=>{
-					if(this.problemList[index].selected == 1){
+				this.problemList.forEach((value, index) => {
+					if (this.problemList[index].selected == 1) {
 						quNum++
 					}
 				})
-				this.answerList.forEach((value,index)=>{
-					if(this.answerList[index].selected == 1){
+				this.answerList.forEach((value, index) => {
+					if (this.answerList[index].selected == 1) {
 						anNum++
 					}
 				})
-				if(num==0){
-					if(quNum<1){
+				if (num == 0) {
+					if (quNum < 1) {
 						uni.showToast({
-							title:'至少选择一条提问！',
-							icon:"none"
+							title: '至少选择一条提问！',
+							icon: "none"
 						})
-					}else{
+					} else {
 						this.delType = num
 						this.delshow = true
 					}
-				}else{
-					if(anNum<1){
+				} else {
+					if (anNum < 1) {
 						uni.showToast({
-							title:'至少选择一条回答！',
-							icon:"none"
+							title: '至少选择一条回答！',
+							icon: "none"
 						})
-					}else{
+					} else {
 						this.delType = num
 						this.delshow = true
 					}
@@ -495,216 +510,250 @@
 </script>
 
 <style lang="scss">
-page{background-color: #F7F7F7;}
-.question-box{
-	.empty-box{
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		align-items: center;
-		.tohome-box{
-			color:#999999;
-			margin-top: 50rpx;
-		}
-		.question-empty{
-			width: 113rpx;
-			height: 98rpx;
-		}
+	page {
+		background-color: #F7F7F7;
 	}
-	.Put-box1 {
-		.btn {
-			text-align: center;
-			margin-top: 40rpx;
-			border: 1px solid #333333;
-			height: 80upx;
-			line-height: 80upx;
-			width: 100%;
-			color: #333333;
-		}
 
-		.submit {
-			background-color: #333333;
-			color: #FFEBC4;
-		}
-	}
-	.cancelDel {
-		position: absolute;
-		bottom: -50px;
-		left: 45%;
+	.question-box {
+		.empty-box {
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
 
-		image {
-			width: 60upx;
-			height: 60upx;
+			.tohome-box {
+				color: #999999;
+				margin-top: 50rpx;
+			}
 
+			.question-empty {
+				width: 113rpx;
+				height: 98rpx;
+			}
 		}
-	}
 
-	.function-box{
-		background-color: #F7F7F7;
-	}
-	.tabsbox{
-		margin-top: 4rpx;
-		background-color: #FFFFFF;
-	}
-	.editicon-box{
-		display: flex;
-		justify-content: flex-end;
-		position: relative;
-		left: -30rpx;
-		padding: 16rpx 0;
-	}
-	.finishbox{
-		display: flex;
-		justify-content: flex-end;
-		position: relative;
-		left: -30rpx;
-		padding: 16rpx 0;
-	}
-	.editicon{
-		width: 50rpx;
-		height: 50rpx;
-	}
-	.swipe-box{
-		width: 100%;
-    padding: 0 24rpx;
-    .itemBox {
-      background: #FFFFFF;
-    }
-		.replynum-box{
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			.item-btn-right{
-        margin-left: 15rpx;
-				width: 14upx;
-				height: 24upx !important;
+		.Put-box1 {
+			.btn {
+				text-align: center;
+				margin-top: 40rpx;
+				border: 1px solid #333333;
+				height: 80upx;
+				line-height: 80upx;
+				width: 100%;
+				color: #333333;
+			}
+
+			.submit {
+				background-color: #333333;
+				color: #FFEBC4;
 			}
 		}
-		.item {
-			display: flex;
-			padding: 20rpx 20rpx 20rpx 40rpx;
-      .qAarrow {
-        image {
-          width: 16rpx;
-          height: 24rpx;
-          margin-left: 10rpx;
-        }
-      }
-		}
-		.product-img{
-			width: 180rpx;
-			flex: 0 0 180rpx;
-			height: 180rpx;
+
+		.cancelDel {
+			position: absolute;
+			bottom: -50px;
+			left: 45%;
+
+			image {
+				width: 60upx;
+				height: 60upx;
+
+			}
 		}
-		.head-img{
-			width: 80rpx;
-			flex: 0 0 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
+
+		.function-box {
+			background-color: #F7F7F7;
 		}
-    label {
-      width: 36rpx;
-      height: 36rpx;
-      display: block;
-      line-height: 36rpx;
-      text-align: center;
-      background: #C83732;
-      color: #FFFFFF;
-      font-size: 20rpx;
-      margin-right: 20rpx;
-    }
-    .replyBox {
-
-    }
-    .reply {
-      margin-top: 20rpx;
-      label {
-        background: #C5AA7B;
-      }
-    }
-		.title {
-			text-align: left;
-			font-size: 28rpx;
-			color: $u-content-color;
+
+		.tabsbox {
+			margin-top: 4rpx;
+			background-color: #FFFFFF;
 		}
-		.cart-select-img {
-		  width: 40upx;
-		  height: 40upx;
-		  margin: 0upx 30upx 0upx;
-		  box-sizing: border-box;
+
+		.editicon-box {
+			display: flex;
+			justify-content: flex-end;
+			position: relative;
+			left: -30rpx;
+			padding: 16rpx 0;
 		}
-		.toStore{
-			border: 1rpx #C5AA7B solid;
-			color: #C5AA7B;
-			padding: 0rpx 20rpx;
-			border-radius: 5rpx;
-			height: 52rpx;
+
+		.finishbox {
+			display: flex;
+			justify-content: flex-end;
+			position: relative;
+			left: -30rpx;
+			padding: 16rpx 0;
 		}
-	}
-	.allcheck-box{
-		background-color: #FFFFFF;
-		width: 100%;
-		position: fixed;
-		bottom: 0upx;
-		.left {
-		  display: flex;
-		  flex-direction: row;
-		  align-items: center;
-		  font-size: 28upx;
-		  color: #666;
-		  .cart-select-img {
-		    width: 40upx;
-		    height: 40upx;
-		    margin: 30upx;
-		    box-sizing: border-box;
-		  }
+
+		.editicon {
+			width: 50rpx;
+			height: 50rpx;
 		}
-		.right {
-		  display: flex;
-		  flex-direction: row;
-		  align-items: center;
-		  box-sizing: border-box;
+
+		.swipe-box {
+			width: 100%;
+			padding: 0 24rpx;
+
+			.itemBox {
+				background: #FFFFFF;
+			}
+
+			.replynum-box {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.item-btn-right {
+					margin-left: 15rpx;
+					width: 14upx;
+					height: 24upx !important;
+				}
+			}
+
+			.item {
+				display: flex;
+				padding: 20rpx 20rpx 20rpx 40rpx;
+				width: 700rpx;
+
+				.qAarrow {
+					image {
+						width: 16rpx;
+						height: 24rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+
+			.product-img {
+				width: 180rpx;
+				flex: 0 0 180rpx;
+				height: 180rpx;
+			}
+
+			.head-img {
+				width: 80rpx;
+				flex: 0 0 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+			}
+
+			label {
+				width: 36rpx;
+				height: 36rpx;
+				display: block;
+				line-height: 36rpx;
+				text-align: center;
+				background: #C83732;
+				color: #FFFFFF;
+				font-size: 20rpx;
+				margin-right: 20rpx;
+			}
+
+			.replyBox {}
+
+			.reply {
+				margin-top: 20rpx;
+
+				label {
+					background: #C5AA7B;
+				}
+			}
+
+			.title {
+				text-align: left;
+				font-size: 28rpx;
+				color: $u-content-color;
+			}
+
+			.cart-select-img {
+				width: 40upx;
+				height: 40upx;
+				margin: 0upx 30upx 0upx 0upx;
+				box-sizing: border-box;
+			}
+
+			.toStore {
+				border: 1rpx #C5AA7B solid;
+				color: #C5AA7B;
+				padding: 0rpx 20rpx;
+				border-radius: 5rpx;
+				height: 52rpx;
+			}
 		}
-		.btn-delete {
-		  width: 230upx;
-		  height: 100upx;
-		  line-height: 100upx;
-		  text-align: center;
-		  font-size: 30upx;
-		  color: #FFFFFF;
-      background: #C83732;
+
+		.allcheck-box {
+			background-color: #FFFFFF;
+			width: 100%;
+			position: fixed;
+			bottom: 0upx;
+
+			.left {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				font-size: 28upx;
+				color: #666;
+
+				.cart-select-img {
+					width: 40upx;
+					height: 40upx;
+					margin: 30upx;
+					box-sizing: border-box;
+				}
+			}
+
+			.right {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				box-sizing: border-box;
+			}
+
+			.btn-delete {
+				width: 230upx;
+				height: 100upx;
+				line-height: 100upx;
+				text-align: center;
+				font-size: 30upx;
+				color: #FFFFFF;
+				background: #C83732;
+			}
 		}
 	}
-}
 </style>
 <style>
-  .question-box /deep/ .u-tabs #u-tab-item-0 {
-    position: relative;
-  }
-  .question-box /deep/ .u-tabs #u-tab-item-0:before {
-    content: '';
-    display: block;
-    width: 2rpx;
-    height: 30rpx;
-    position: absolute;
-    right: 0;
-    top: 25rpx;
-    background: #CCCCCC;
-  }
-   .swipe-box /deep/ .u-swipe-del {
-     align-items: center;
-     justify-content: center;
-     width: 120rpx !important;
-   }
-  .swipe-box /deep/ .u-btn-text {
-    width: 60rpx;
-    height: 60rpx;
-    display: block;
-    background: url("https://ceres.zkthink.com/static/images/delIcon.png") no-repeat center center;
-    background-size: contain;
-  }
-  .swipe-box /deep/ .u-swipe-action {
-    background: none !important;
-    margin-bottom: 20rpx;
-  }
+	.question-box /deep/ .u-tabs #u-tab-item-0 {
+		position: relative;
+	}
+
+	.question-box /deep/ .u-tabs #u-tab-item-0:before {
+		content: '';
+		display: block;
+		width: 2rpx;
+		height: 30rpx;
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		background: #CCCCCC;
+	}
+
+	.swipe-box /deep/ .u-swipe-del {
+		align-items: center;
+		justify-content: center;
+		width: 120rpx !important;
+	}
+
+	.swipe-box /deep/ .u-btn-text {
+		width: 60rpx;
+		height: 60rpx;
+		display: block;
+		background: url("https://ceres.zkthink.com/static/images/delIcon.png") no-repeat center center;
+		background-size: contain;
+	}
+
+	.swipe-box /deep/ .u-swipe-action {
+		background: none !important;
+		margin-bottom: 20rpx;
+	}
 </style>

utils/hidden.js

@@ -0,0 +1,15 @@
+// 中间部分
+export function hidden (str, frontLen, endLen) {
+  let endLenData = 0
+  if (str.length !== 2) {
+    endLenData = endLen
+  }
+  const len = str.length - frontLen - endLenData;
+  let xing = '';
+  for (let i = 0; i < len; i++) {
+    xing += '*';
+  }
+  return (
+    str.substring(0, frontLen) + xing + str.substring(str.length - endLenData)
+  );
+}