修改秒杀列表查询

微信浏览器在待付款页面调起支付修改为jsapi

App.vue

@@ -2,6 +2,9 @@
 // // #ifdef MP-WEIXIN
 // const miniShopPlugin = requirePlugin('mini-shop-plugin');
 // // #endif
+import NET from "@/utils/request";
+import API from "@/config/api";
+
 export default {
   onLaunch: function (options) {
     if (options && options.path === 'pages_category_page1/goodsModule/goodsDetails' && options.query) {
@@ -39,18 +42,31 @@ export default {
       }
     })
     // 购物车右上角数量
-    let allCartNum = (uni.getStorageSync('allCartNum')).toString()
-    if (allCartNum > 0) {
-      uni.setTabBarBadge({
-        index: 2,
-        text: allCartNum
-      })
-    }
-  },
+		if(uni.getStorageSync('storage_key')){
+			NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
+			  let cartNum = 0
+			  resCart.data.forEach(shopItem=>{
+			    shopItem.skus.forEach(goodsItem=>{
+			      cartNum += goodsItem.number
+			    })
+			  })
+			  uni.setStorageSync('allCartNum', cartNum)
+			  if (cartNum > 0) {
+			    uni.setTabBarBadge({
+			      index: 2,
+			      text: cartNum.toString()
+			    })
+			  }
+			})
+		}
+  }
+  ,
   globalData: {
     isIphone: false,
-  },
-};
+  }
+  ,
+}
+;
 </script>
 
 <style lang="scss">

components/Loading/index.vue

@@ -0,0 +1,250 @@
+ <!-- @auth kahu -->
+<template>
+  <view class="loading_box mask flex-center"
+        @touchmove.stop.prevent="HandlePageMove">
+    <!--  点动画  -->
+    <view class="dot_box theOuterRotation"
+          v-if="false">
+      <view class="dot_item"
+            v-for="item in 4"></view>
+    </view>
+
+    <!-- 进度条动画 -->
+    <view class="progress_box" v-if="false">
+      <view class="progress_item progress_roll_center"></view>
+    </view>
+    Loading....
+  </view>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {}
+
+  },
+  onPageScroll(e) {
+    return false
+  },
+
+  mounted() {
+    console.log(getCurrentPages())
+    //#ifdef H5
+    //#endif
+  },
+
+  methods: {
+    HandlePageMove() {
+      return false
+    }
+  }
+}
+</script>
+
+<style lang="scss"
+       scoped>
+.mask {
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.5);
+  color: #fff;
+}
+
+.flex-center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.loading_box {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  z-index: 9999;
+
+  /** 点动画*/
+  .theOuterRotation {
+    animation: rotate 2s ease-in-out .5s infinite normal;
+  }
+
+  .dot_box {
+    width: 80rpx;
+    height: 80rpx;
+    //background: #fff;
+    border-radius: 20rpx;
+    margin: 20rpx 0;
+    position: relative;
+
+    // 原始dot
+    .dot_item {
+      width: 30rpx;
+      height: 30rpx;
+      background: #fff;
+      border-radius: 50%;
+      position: absolute;
+      transition: all .6s;
+      box-shadow: 0 0 2rpx #b4b4b4;
+
+      &:nth-child(1) {
+        top: 0;
+        left: 0;
+      }
+
+      &:nth-child(2) {
+        top: 0;
+        right: 0;
+      }
+
+      &:nth-child(3) {
+        bottom: 0;
+        right: 0;
+      }
+
+      &:nth-child(4) {
+        bottom: 0;
+        left: 0;
+      }
+    }
+
+    // 单双放大动画
+    .dot_scale {
+      &:nth-child(1) {
+        top: 0;
+        left: 0;
+        animation: magnify 2s ease-in-out 0s infinite alternate;
+      }
+
+      &:nth-child(2) {
+        top: 0;
+        right: 0;
+        animation: magnify 2s ease-in-out 1s infinite alternate;
+      }
+
+      &:nth-child(3) {
+        bottom: 0;
+        right: 0;
+        animation: magnify 2s ease-in-out 0s infinite alternate;
+      }
+
+      &:nth-child(4) {
+        bottom: 0;
+        left: 0;
+        animation: magnify 2s ease-in-out 1s infinite alternate;
+      }
+    }
+
+    // 单点移动动画
+    .dot_move {
+      &:nth-child(1) {
+        z-index: 2;
+        animation: moveDot 2s ease-in-out 0s infinite normal;
+      }
+    }
+
+    // 单偶放大
+    @keyframes magnify {
+      0% {
+        transform: scale(1);
+        background: rgba(0, 255, 228, 0.82);
+      }
+      25% {
+        background: #32b5cc;
+      }
+      50% {
+        transform: scale(1.4);
+        background: #73e34e;
+      }
+      75% {
+        background: #0ec469;
+      }
+      100% {
+        transform: scale(1);
+        background: #868686;
+      }
+    }
+
+    // 移动单点
+    @keyframes moveDot {
+      0% {
+        top: 0;
+        left: 0;
+        background: #d0f598;
+      }
+      25% {
+        top: 0;
+        left: 100%;
+        transform: translateX(-100%);
+        background: #f5e298;
+      }
+      50% {
+        top: 100%;
+        left: 100%;
+        transform: translate(-100%, -100%);
+        background: #6bea91;
+      }
+      75% {
+        top: 100%;
+        left: 0;
+        transform: translateY(-100%);
+        background: #e84c7a;
+      }
+      100% {
+        top: 0;
+        left: 0;
+      }
+
+    }
+
+    @keyframes rotate {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+  }
+
+
+  /** 进度条动画*/
+  .progress_box{
+    width: 300rpx;
+    height: 25rpx;
+    margin: 20rpx 0;
+    border-radius: 25rpx;
+    background-color: #fff;
+    position: relative;
+    overflow: hidden;
+    .progress_item{
+      width: 0%;
+      height: 100%;
+      background: #f68686;
+      border-radius: 25rpx;
+
+    }
+    .progress_roll{
+      animation: roll 1s ease-in-out 0s infinite alternate-reverse;
+    }
+    .progress_roll_center{
+      width: 5%;
+      transition: all .6s;
+      margin: 0 auto;
+      animation: roll 1s cubic-bezier(.15,.2,.05,.4) 0s infinite alternate-reverse;
+    }
+  }
+
+  @keyframes roll {
+    from{
+      width: 5%;
+    }
+    to{
+      width: 100%;
+    }
+  }
+
+}
+</style>

components/adWindow.vue

@@ -1,13 +1,20 @@
 <template>
-	<view v-if="visible">
-		<view v-if="adInfo.jumpType === 3 && couponList && couponList.length> 0" class="mask mask-coupon ad-coupons"
-			@touchmove.stop.prevent="moveHandle">
-			<view class="ad-box-warp">
-				<view class="ad-boxs">
-					<image class="img" :src="adInfo.popupImg" mode="widthFix"></image>
-					<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 v-if="visible">
+    <view v-if="adInfo.jumpType === 3 && couponList && couponList.length> 0"
+          class="mask mask-coupon ad-coupons"
+          @touchmove.stop.prevent="moveHandle">
+      <view class="ad-box-warp">
+        <view class="ad-boxs">
+          <image class="img"
+                 :src="adInfo.popupImg"
+                 mode="widthFix"></image>
+          <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="leftBox borderBox">
                   <view class="boxTop"></view>
                   <view class="boxCent"></view>
@@ -16,14 +23,15 @@
                 <view class="centerBox">
                   <view class="money">
                     <text class="num"
-                          :class="[item.discountMode ===1?'num-minus':'num-discount']">{{ item.reduceMoney }}</text>
+                          :class="[item.discountMode ===1?'num-minus':'num-discount']">{{ item.reduceMoney }}
+                    </text>
                     <text class="text">
                       满{{ item.fullMoney }}元可用
                     </text>
                   </view>
                   <view class="text">
                     <text>
-                      {{item.activityName}}
+                      {{ item.activityName }}
                     </text>
                   </view>
                 </view>
@@ -32,273 +40,303 @@
                   <view class="boxCent"></view>
                   <view class="boxBottom"></view>
                 </view>
-							</view>
-						</scroll-view>
-					</view>
-					<WxSendCoupon v-if="couponList && couponList.length > 0" :couponList="couponList" @closeAd="close">
-						<view class="btn-receive">一键领取</view>
-					</WxSendCoupon>
-				</view>
-				<view class="close-btn">
-					<image :src="adInfo.closeImg" class='btn' mode="widthFix" @click="close()"></image>
-				</view>
-			</view>
-		</view>
-		<view v-else-if="adInfo.jumpType !== 3" class="mask mask-coupon ad-link">
-			<view class="ad-box-warp">
-				<view class="ad-boxs" @click="goRoll()">
-					<image class="img" :src="adInfo.popupImg" mode="widthFix"></image>
-				</view>
-				<view class="close-btn">
-					<image :src="adInfo.closeImg" class='btn' mode="widthFix" @click="close()"></image>
-				</view>
-			</view>
-		</view>
-	</view>
+              </view>
+            </scroll-view>
+          </view>
+          <WxSendCoupon v-if="couponList && couponList.length > 0"
+                        :couponList="couponList"
+                        @closeAd="close">
+            <view class="btn-receive">一键领取</view>
+          </WxSendCoupon>
+        </view>
+        <view class="close-btn">
+          <image :src="adInfo.closeImg"
+                 class='btn'
+                 mode="widthFix"
+                 @click="close()"></image>
+        </view>
+      </view>
+    </view>
+    <view v-else-if="adInfo.jumpType !== 3"
+          class="mask mask-coupon ad-link">
+      <view class="ad-box-warp">
+        <view class="ad-boxs"
+              @click="goRoll()">
+          <image class="img"
+                 :src="adInfo.popupImg"
+                 mode="widthFix"></image>
+        </view>
+        <view class="close-btn">
+          <image :src="adInfo.closeImg"
+                 class='btn'
+                 mode="widthFix"
+                 @click="close()"></image>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import WxSendCoupon from "./wx/wxSendCoupon";
-	const NET = require('../utils/request')
-	const API = require('../config/api')
-
-	export default {
-		name: "adWindow",
-		components: {
-			WxSendCoupon
-		},
-		props: {
-			triggerCondition: {
-				type: Number,
-				default: 1
-			}
-		},
-		data() {
-			return {
-				visible: false,
-				adInfo: {},
-				jumpContent: {},
-				couponList: [],
-				isLogin: false,
-				buyerUserId: 0,
-				cParams: {}
-			};
-		},
-		methods: {
-			// 阻止滑动
-			moveHandle() {
-				return
-			},
-			// 获取广告信息
-			getAd() {
-				const res = uni.getStorageSync('storage_key'),
-						token = res.token;
-				this.buyerUserId = res.buyerUserId
-				this.isLogin = !!token
-				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) {
-							this.jumpContent = JSON.parse(this.adInfo.jumpContent)
-						}
-						this.visible = true
-						if (this.adInfo.jumpType === 3) {
-							this.getCoupons()
-						}
-					}
-				}).catch(res => {
-
-				})
-			},
-			// 查询优惠券
-			getCoupons() {
-				if (this.isLogin) {
-					const _items = this.jumpContent.items
-					if (_items) {
-						NET.request(API.getCoupons, {
-							page: 1,
-							pageSize: 99,
-							ids: _items
-						}, 'GET').then(res => {
-							if (res.data) {
-								this.couponList = res.data.list
-							}
-						}).catch(res => {
-
-						})
-					}
-				} else {
-					uni.showToast({
-						title: '登录之后领取更多优惠',
-						icon: "none"
-					})
-					// uni.navigateTo({
-					// 	url: '/pages_category_page2/userModule/login'
-					// })
-				}
-			},
-			// 关闭弹窗
-			close() {
-				this.visible = false
-				var params = {}
-				if (this.isLogin) {
-					params.buyerUserId = this.buyerUserId
-				} else {
-					uni.getSystemInfo({
-						success: function(res) {
-							params.deviceId = res.deviceId
-						}
-					})
-				}
-				NET.request(API.adClose, params, 'POST').then(res => {}).catch(res => {})
-			},
-			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.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=${_id}`
-						})
-						break
-					case 4:
-						uni.navigateToMiniProgram({
-							appId: this.jumpContent.appId,
-							path: this.jumpContent.link,
-							success(res) {
-								// 打开成功
-							}
-						})
-					case 5:
-						uni.navigateTo({
-							path: this.jumpContent.link
-						})
-						break
-				}
-			},
-		}
-	};
+import WxSendCoupon from "./wx/wxSendCoupon";
+
+const NET = require('../utils/request')
+const API = require('../config/api')
+
+export default {
+  name: "adWindow",
+  components: {
+    WxSendCoupon
+  },
+  props: {
+    triggerCondition: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      adInfo: {},
+      jumpContent: {},
+      couponList: [],
+      isLogin: false,
+      buyerUserId: 0,
+      cParams: {}
+    };
+  },
+  methods: {
+    // 阻止滑动
+    moveHandle() {
+      return
+    },
+    // 获取广告信息
+    getAd() {
+      const res = uni.getStorageSync('storage_key'),
+          token = res.token;
+      setTimeout(() => {
+        this.buyerUserId = res.buyerUserId
+        this.isLogin = !!token
+        console.log(this.buyerUserId,this.isLogin,this.triggerCondition)
+        NET.request(API.GetAd, {
+          triggerCondition: 2
+        }, 'POST').then(res => {
+          console.log('123131321323', res)
+          if (res.data) {
+            this.adInfo = res.data[0]
+            if (this.adInfo.jumpContent) {
+              this.jumpContent = JSON.parse(this.adInfo.jumpContent)
+            }
+            this.visible = true
+            if (this.adInfo.jumpType === 3) {
+              this.getCoupons()
+            }
+          }
+        }).catch(res => {
+
+        })
+      }, 500)
+    },
+    // 查询优惠券
+    getCoupons() {
+      if (this.isLogin) {
+        const _items = this.jumpContent.items
+        if (_items) {
+          NET.request(API.getCoupons, {
+            page: 1,
+            pageSize: 99,
+            ids: _items
+          }, 'GET').then(res => {
+            if (res.data) {
+              this.couponList = res.data.list
+            }
+          }).catch(res => {
+
+          })
+        }
+      } else {
+        uni.showToast({
+          title: '登录之后领取更多优惠',
+          icon: "none"
+        })
+        // uni.navigateTo({
+        // 	url: '/pages_category_page2/userModule/login'
+        // })
+      }
+    },
+    // 关闭弹窗
+    close() {
+      this.visible = false
+      var params = {}
+      if (this.isLogin) {
+        params.buyerUserId = this.buyerUserId
+      } else {
+        uni.getSystemInfo({
+          success: function (res) {
+            params.deviceId = res.deviceId
+          }
+        })
+      }
+      NET.request(API.adClose, params, 'POST').then(res => {
+      }).catch(res => {
+      })
+    },
+    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.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=${_id}`
+          })
+          break
+        case 4:
+          uni.navigateToMiniProgram({
+            appId: this.jumpContent.appId,
+            path: this.jumpContent.link,
+            success(res) {
+              // 打开成功
+            }
+          })
+        case 5:
+          uni.navigateTo({
+            path: this.jumpContent.link
+          })
+          break
+      }
+    },
+  }
+};
 </script>
 
-<style scoped lang="scss">
+<style scoped
+       lang="scss">
 .mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 55;
-	background-color: rgba(0, 0, 0, 0.7);
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 55;
+  background-color: rgba(0, 0, 0, 0.7);
 }
 
 
 .mask-coupon {
-	z-index: 9999;
-	/*background: rgba(39, 38, 39, .15);*/
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	.ad-box-warp {
-		width: 100%;
-		position: relative;
-	}
-
-	flex-direction: column;
-
-	.ad-boxs {
-		position: relative;
-		width: 100%;
-		text-align: center;
-		.img {
-			width: 70%;
-		}
-	}
-	.btn-receive {
-		width: 446rpx;
-		height: 84rpx;
-		background: #EC6F43;
-		border-radius: 42rpx;
-		display: block;
-		text-align: center;
-		font-size: 28rpx;
-		line-height: 84rpx;
-		color: #fff;
-		position: absolute;
-		bottom: 32rpx;
-		left: 50%;
-		margin-left: -223rpx;
-	}
-	.close-btn {
-		position: absolute;
-		bottom: -70rpx;
-		left: 50%;
-		margin-left: -25rpx;
-
-		.btn {
-			width: 50rpx;
-			height: 50rpx;
-		}
-	}
+  z-index: 9999;
+  /*background: rgba(39, 38, 39, .15);*/
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .ad-box-warp {
+    width: 100%;
+    position: relative;
+  }
+
+  flex-direction: column;
+
+  .ad-boxs {
+    position: relative;
+    width: 100%;
+    text-align: center;
+
+    .img {
+      width: 70%;
+    }
+  }
+
+  .btn-receive {
+    width: 446rpx;
+    height: 84rpx;
+    background: #EC6F43;
+    border-radius: 42rpx;
+    display: block;
+    text-align: center;
+    font-size: 28rpx;
+    line-height: 84rpx;
+    color: #fff;
+    position: absolute;
+    bottom: 32rpx;
+    left: 50%;
+    margin-left: -223rpx;
+  }
+
+  .close-btn {
+    position: absolute;
+    bottom: -70rpx;
+    left: 50%;
+    margin-left: -25rpx;
+
+    .btn {
+      width: 50rpx;
+      height: 50rpx;
+    }
+  }
 }
 
 .ad-coupons {
-	.ad-box-warp {
-		width: 510rpx;
-		.ad-boxs {
-			.img {
-				width: 100%;
-			}
-		}
-	}
-
-	.coupon-list {
-		width: 446rpx;
-		height: 295rpx;
-		overflow: auto;
-		position: absolute;
-		top: 308rpx;
-		left: 50%;
-		margin-left: -223rpx;
-		.scrollBox {
-			height: 294upx;
-		}
-		.item {
-			width: 100%;
-			height: 140rpx;
-			margin-top: 15rpx;
-			border-radius: 8rpx;
-			display: flex;
-			position: relative;
-			align-items: center;
+  .ad-box-warp {
+    width: 510rpx;
+
+    .ad-boxs {
+      .img {
+        width: 100%;
+      }
+    }
+  }
+
+  .coupon-list {
+    width: 446rpx;
+    height: 295rpx;
+    overflow: auto;
+    position: absolute;
+    top: 308rpx;
+    left: 50%;
+    margin-left: -223rpx;
+
+    .scrollBox {
+      height: 294upx;
+    }
+
+    .item {
+      width: 100%;
+      height: 140rpx;
+      margin-top: 15rpx;
+      border-radius: 8rpx;
+      display: flex;
+      position: relative;
+      align-items: center;
       overflow: hidden;
-			&:first-child {
-				margin-top: 0px;
-			}
+
+      &:first-child {
+        margin-top: 0px;
+      }
+
       .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;
@@ -312,12 +350,14 @@
             border: 32rpx solid #FFFFFF;
           }
         }
+
         .boxBottom {
           width: 32rpx;
           height: 54rpx;
           background: #FFFFFF;
         }
       }
+
       .leftBox {
         .boxCent {
           &:after {
@@ -325,8 +365,10 @@
           }
         }
       }
+
       .rightBox {
       }
+
       .centerBox {
         display: flex;
         align-items: center;
@@ -334,47 +376,48 @@
         background: #FFFFFF;
         flex: 1;
       }
-			.money {
-				width: 190rpx;
-				text-align: center;
-
-				.num {
-					font-size: 48rpx;
-					color: #EC6F43;
-					display: block;
-
-					&.num-minus::before {
-						content: '¥';
-						font-size: 36rpx;
-					}
-
-					&.num-discount::after {
-						content: '折';
-						font-size: 36rpx;
-					}
-				}
-
-				.text {
-					font-size: 24rpx;
-					color: #999;
-				}
-			}
-
-			.text {
-				flex: 1;
-				padding-right: 16rpx;
-				width: 0;
-
-				text {
-					font-size: 32rpx;
-					color: #333;
-					display: block;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-			}
-		}
-	}
+
+      .money {
+        width: 190rpx;
+        text-align: center;
+
+        .num {
+          font-size: 48rpx;
+          color: #EC6F43;
+          display: block;
+
+          &.num-minus::before {
+            content: '¥';
+            font-size: 36rpx;
+          }
+
+          &.num-discount::after {
+            content: '折';
+            font-size: 36rpx;
+          }
+        }
+
+        .text {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+
+      .text {
+        flex: 1;
+        padding-right: 16rpx;
+        width: 0;
+
+        text {
+          font-size: 32rpx;
+          color: #333;
+          display: block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+    }
+  }
 }
 </style>

components/basics/categoryShow.vue

@@ -84,16 +84,22 @@ name: "categoryShow",
         mask: true,
         title:'加载中...'
       })
+      if (this.total!=0&&this.productList.length>=this.total){
+        console.log("加载完了")
+        return
+      }
       NET.request(API.getProducts, {
         classifyId: this.categoryid,
         page:this.page,
         pageSize:this.pageSize
       }, 'GET').then(res => {
-        this.productList = res.data.list
+        this.productList = [...this.productList,...res.data.list]
+        this.total = res.data.total
         uni.hideLoading()
-        if (this.productList.length === 0) {
+        if (this.productList.length ===0) {
           this.ifShow = true
         }
+
       }).catch(res => {
         uni.hideLoading()
       })

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="hom-pro-list">
+  <div class="hom-pro-list" v-if="productData.products.length">
     <div class="title">
       <!-- #ifdef MP-WEIXIN -->
       <img class="title-img" src="../../../static/images/discount/img-title.png" alt="限时折扣" mode="widthFix"/>

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

@@ -34,9 +34,9 @@
               <div class="price">
                 ¥ {{item.price}}
               </div>
-              <div class="original-price">
+              <!-- <div class="original-price">
                 ¥ {{item.originalPrice}}
-              </div>
+              </div> -->
             </div>
           </div>
         </div>

components/canvasShow/canvasShowPage.vue

@@ -45,6 +45,7 @@
                           :typeId="typeId"
                           :shopId="shopId"></com-image-text-nav>
       <com-product v-if="item.type==='productList'"
+                   ref="productPage"
                    :componentContent="item.componentContent"
                    :terminal="terminal"
                    :typeId="typeId"

config/api.js

@@ -121,6 +121,7 @@ module.exports = {
 	ReasonEnums: WX_API_BASE + '/after/getReasonSelect', //  选择退款原因查询
 	ApplyReturnMoney: WX_API_BASE + '/after/submit', //  申请售后
 	GetHuabeiConfig: WX_API_BASE + '/order/getHuabeiConfig', //查询花呗手续费配置
+	GetRefundMoney:WX_API_BASE + '/after/getReturnPrice',// 获取退款金额
 
 	//购物车
 	ShoppingaddCart: WX_API_BASE + '/cart/addCart', //  加入购物车
@@ -193,6 +194,9 @@ module.exports = {
 	getSeckillList: WX_API_BASE + '/seckill/getIndex', //秒杀专区首页数据查询
 	getProblems: WX_API_BASE + '/seckill/getProblems', //商品问答数据查询
 	getProblemDetail: WX_API_BASE + '/seckill/getProblemDetail', //问答详情查询
+	getQueryPlatformSeckillList: WX_API_BASE + '/platform-seckill/queryPlatformSeckillList', //平台秒杀列表
+	getPlatformSeckills: WX_API_BASE + '/canvas/getPlatformSeckills', //根据seckillId查询对应的秒杀商品列表
+	
 	//拼团专区
 	getGroupSettlement: WX_API_BASE + '/work/getSettlement', //拼团单结算查询
 	getGroupBuyList: WX_API_BASE + '/work/getIndex', //拼团专区首页数据查询

manifest.json

@@ -2,8 +2,8 @@
     "name" : "cereshop",
     "appid" : "__UNI__ECAA86F",
     "description" : "cereshop",
-    "versionName" : "1.6.0",
-    "versionCode" : 160,
+    "versionName" : "1.7.2",
+    "versionCode" : 172,
     "transformPx" : false,
     "app-plus" : {
         "kernel" : {
@@ -22,6 +22,9 @@
             "Payment" : {},
             "Share" : {}
         },
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -60,7 +63,7 @@
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wxec665c74647095aa",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://ceres.zkthink.com/apple-app-site-association"
                     }
                 },
                 "maps" : {},
@@ -71,7 +74,7 @@
                 "share" : {
                     "weixin" : {
                         "appid" : "wxec665c74647095aa",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://ceres.zkthink.com/apple-app-site-association"
                     }
                 },
                 "push" : {}

pages/tabbar/cart/index.vue

@@ -218,7 +218,7 @@
 
       <!-- 热门推荐 -->
       <HotTemplate/>
-
+      <view style="width: 100%;height: 100rpx;background-color:#efefef;"></view>
       <!-- 删除确认弹窗 -->
       <tui-modal :show="cardModal"
                  :custom="true"
@@ -243,6 +243,7 @@
         </view>
       </tui-modal>
     </view>
+  </view>
 </template>
 
 <script>
@@ -566,6 +567,10 @@ export default {
         this.allNum = this.dataList.length
         if (this.dataList.length === 0) {
           this.isEmpty = true
+		  uni.setStorageSync('allCartNum', 0)
+		  uni.removeTabBarBadge({
+		    index: 2
+		  })
         }
         let recheck = false
         this.dataList.forEach((item, index) => {
@@ -648,18 +653,20 @@ export default {
     },
     // 数量加
     numAdd(index, cIndex) {
-      console.log('点击')
       this.dataList[index].priceNumber = 0
-      if (this.dataList[index].skus[cIndex].number <= 100) {
-        this.dataList[index].skus[cIndex].number = this.dataList[index].skus[cIndex].number + 1
-        this.dataList[index].priceNumber = 0
-        this.priceFn(index)
-        this.updateCart(this.dataList[index].skus[cIndex].skuId, this.dataList[index].skus[cIndex].number)
-      } else {
+      if (this.dataList[index].skus[cIndex].number >= this.dataList[index].skus[cIndex].stockNumber) {
+        this.dataList[index].skus[cIndex].number = this.dataList[index].skus[cIndex].stockNumber
         wx.showToast({
           title: '库存不足！',
           icon: 'none'
         })
+        return;
+      }
+      if (this.dataList[index].skus[cIndex].number <= this.dataList[index].skus[cIndex].stockNumber) {
+        this.dataList[index].skus[cIndex].number = this.dataList[index].skus[cIndex].number + 1
+        this.dataList[index].priceNumber = 0
+        this.priceFn(index)
+        this.updateCart(this.dataList[index].skus[cIndex].skuId, this.dataList[index].skus[cIndex].number)
       }
     },
     updateMoneyAndNum() {
@@ -976,7 +983,6 @@ page {
 }
 
 .content {
-  padding: 0 0 110rpx;
   overflow: hidden;
 
   .goosDetailshow-box {
@@ -1022,7 +1028,7 @@ page {
           box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
           color: #C5AA7B;
           margin-left: 30upx;
-          padding: 10upx 32 upx;
+          padding: 10upx 32upx;
           font-size: 26upx;
           text-align: center;
           z-index: 1;
@@ -1050,7 +1056,7 @@ page {
           background-color: #FFE4D0;
           color: #FF7800;
           margin-left: 30upx;
-          padding: 10upx 32 upx;
+          padding: 10upx 32upx;
           border-radius: 28upx;
           border: 1upx solid #FF7800;
           font-size: 26upx;

pages/tabbar/index/index.vue

@@ -1,303 +1,364 @@
 <template>
-	<div>
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="header weiXinBox" :style="{'padding-top': topHeight + 'px'}">
-			<view class="topBox" :style="{'height': height + 'px'}">
-				<image class="logo" src="https://ceres.zkthink.com/static/assets/img/logo.png" mode="widthFix"></image>
-			</view>
-		</view>
-		<view class="wxBtnBg" :style="{'padding-top': (topHeight + height + 10) + 'px'}">
-			<view class="weiXinBoxBtn" @click="searchPro">
-				<image class="search-icon" src="https://ceres.zkthink.com/static/images/searchImg.png" mode="widthFix">
-				</image>
-				<text>请输入您想要的宝贝</text>
-			</view>
-		</view>
-		<!-- #endif -->
-		<!-- #ifdef H5 || APP-PLUS -->
-		<view class="header">
-			<view class="topBox topWap">
-				<image class="logo" src="https://ceres.zkthink.com/static/assets/img/logo.png" mode="widthFix"></image>
-				<view class="search-btn" @click="searchPro">
-					<image class="search-icon" src="https://ceres.zkthink.com/static/img/search.png" mode="widthFix">
-					</image>
-				</view>
-			</view>
-		</view>
-		<!-- #endif -->
-		<category-list @tabChange='tabChange'></category-list>
-		<canvas-page v-if="activeTab==0" :terminal="terminal" :typeId="1"></canvas-page>
-		<category-show v-else :categoryid="categoryid"></category-show>
-		<ad-window ref="adWindow" :triggerCondition="1"></ad-window>
-		<view class="reachBottom" v-if="topLeft > 400">
-			<image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix">
-			</image>
-			<text class="reach-text">这里到底了哦~~</text>
-		</view>
-		<tui-modal :show="privacyShow" :custom="true" :fadein="true">
-			<view class="Put-box1">
-				<view class="text-align fs34 fs-bold">
-					协议与隐私政策
-				</view>
-				<p class="mar-top-20">欢迎来到cereshop！我们根据最新的法律、法规、监管政策要求，更新了cereshop隐私政策。</p>
-				<view class="flex-display flex-sp-between">
-					<view class="btn submit" @click="privacyShow = false">
-						同意
-					</view>
-				</view>
-			</view>
-		</tui-modal>
-	</div>
+  <div>
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="header weiXinBox"
+          :style="{'padding-top': topHeight + 'px'}">
+      <view class="topBox"
+            :style="{'height': height + 'px'}">
+        <image class="logo"
+               src="https://ceres.zkthink.com/static/assets/img/logo.png"
+               mode="widthFix"></image>
+      </view>
+    </view>
+    <view class="wxBtnBg"
+          :style="{'padding-top': (topHeight + height + 10) + 'px'}">
+      <view class="weiXinBoxBtn"
+            @click="searchPro">
+        <image class="search-icon"
+               src="https://ceres.zkthink.com/static/images/searchImg.png"
+               mode="widthFix">
+        </image>
+        <text>请输入您想要的宝贝</text>
+      </view>
+    </view>
+    <!-- #endif -->
+    <!-- #ifdef H5 || APP-PLUS -->
+    <view class="header">
+      <view class="topBox topWap">
+        <image class="logo"
+               src="https://ceres.zkthink.com/static/assets/img/logo.png"
+               mode="widthFix"></image>
+        <view class="search-btn"
+              @click="searchPro">
+          <image class="search-icon"
+                 src="https://ceres.zkthink.com/static/img/search.png"
+                 mode="widthFix">
+          </image>
+        </view>
+      </view>
+    </view>
+    <!-- #endif -->
+    <category-list @tabChange='tabChange'></category-list>
+    <canvas-page ref="canvasPage"
+                 v-if="activeTab==0"
+                 :terminal="terminal"
+                 :typeId="1"></canvas-page>
+    <category-show ref="categoryShow"
+                   v-else
+                   :categoryid="categoryid"></category-show>
+    <ad-window ref="adWindow"
+               :triggerCondition="1"></ad-window>
+    <view class="reachBottom"
+          v-if="topLeft > 400">
+      <image class="reach-icon"
+             src="https://ceres.zkthink.com/static/img/reachBottom.png"
+             mode="widthFix">
+      </image>
+      <text class="reach-text">这里到底了哦~~</text>
+    </view>
+    <tui-modal :show="privacyShow"
+               :custom="true"
+               :fadein="true">
+      <view class="Put-box1">
+        <view class="text-align fs34 fs-bold">
+          协议与隐私政策
+        </view>
+        <p class="mar-top-20">欢迎来到cereshop！我们根据最新的法律、法规、监管政策要求，更新了cereshop隐私政策。</p>
+        <view class="flex-display flex-sp-between">
+          <view class="btn submit"
+                @click="privacyShow = false">
+            同意
+          </view>
+        </view>
+      </view>
+    </tui-modal>
+  </div>
 </template>
 
 <script>
-	import tuiModal from "@/components/modal/modal";
-	import AdWindow from "@/components/adWindow";
-	const API = require('../../../config/api')
-	import CategoryList from "@/components/basics/categoryList.vue"
-	import CategoryShow from "@/components/basics/categoryShow.vue"
-	import canvasPage from '@/components/canvasShow/canvasShowPage.vue'
-
-	export default {
-		components: {
-			AdWindow,
-			CategoryList,
-			CategoryShow,
-			canvasPage,
-			tuiModal
-		},
-		data() {
-			return {
-				terminal: API.terminal,
-				activeTab: 0,
-				categoryid: 0,
-				topHeight: 0,
-				height: 0,
-				topLeft: 0,
-				privacyShow:false
-			}
-		},
-		onLoad() {
-			if (!uni.getStorageSync('storage_key')) {
-				// #ifdef APP-PLUS
-				this.privacyShow = true
-				// #endif
-			}
-		},
-		onShow() {
-			// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
-			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			this.topHeight = menuButtonInfo.top + 10
-			this.height = menuButtonInfo.height
-			// #endif
-			this.$nextTick(() => {
-				this.$refs.adWindow.getAd()
-			})
-		},
-		onPageScroll(e) {
-			this.topLeft = e.scrollTop
-		},
-		methods: {
-			tabChange(index, id) {
-				this.activeTab = index
-				this.categoryid = id
-			},
-			// 查询产品
-			searchPro(key, type) {
-				uni.navigateTo({
-					url: `/pages_category_page1/search/index/index`
-				})
-			}
-		}
-	};
+import tuiModal from "@/components/modal/modal";
+import AdWindow from "@/components/adWindow";
+
+const API = require('../../../config/api')
+import CategoryList from "@/components/basics/categoryList.vue"
+import CategoryShow from "@/components/basics/categoryShow.vue"
+import canvasPage from '@/components/canvasShow/canvasShowPage.vue'
+
+export default {
+  components: {
+    AdWindow,
+    CategoryList,
+    CategoryShow,
+    canvasPage,
+    tuiModal
+  },
+  data() {
+    return {
+      terminal: API.terminal,
+      activeTab: 0,
+      categoryid: 0,
+      topHeight: 0,
+      height: 0,
+      topLeft: 0,
+      privacyShow: false
+    }
+  },
+  onReachBottom() {
+    this.HandleLoadMoreProduct()
+  },
+  onLoad() {
+    if (!uni.getStorageSync('storage_key')) {
+      // #ifdef APP-PLUS
+      this.privacyShow = true
+      // #endif
+    }
+    this.$nextTick(() => {
+      this.$refs.adWindow.getAd()
+    })
+  },
+  onShow() {
+    // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    this.topHeight = menuButtonInfo.top + 10
+    this.height = menuButtonInfo.height
+    // #endif
+
+  },
+
+
+  onPageScroll(e) {
+    this.topLeft = e.scrollTop
+  },
+  methods: {
+    /**
+     * 请求非首页的子组件的下一页
+     * */
+    HandleLoadMoreProduct(){
+      if (this.activeTab != 0) {
+        let pitchOnPage = this.$refs.categoryShow
+        if (pitchOnPage.total !== 0 && pitchOnPage.productList.length < pitchOnPage.total) {
+          pitchOnPage.page++
+          pitchOnPage.getData()
+        }
+      }
+    },
+    /**
+     * 清空非首页的子组件商品数据
+     * 回滚请求参数到起始页
+     * */
+    HandleCleanActiveTabProduct(){
+      if(this.$refs.categoryShow){
+        let pitchOnPage = this.$refs.categoryShow
+        pitchOnPage.total = 0
+        pitchOnPage.page=1
+        pitchOnPage.productList=[]
+      }
+    },
+    tabChange(index, id) {
+      this.HandleCleanActiveTabProduct()
+      this.activeTab = index
+      this.categoryid = id
+    },
+    // 查询产品
+    searchPro(key, type) {
+      uni.navigateTo({
+        url: `/pages_category_page1/search/index/index`
+      })
+    }
+  }
+};
 </script>
 
-<style lang="scss" scoped>
-	.header {
-		.toLive {
-			height: 40px;
-			color: #FFF;
-			background-color: #333;
-		}
-
-		.topBox {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			width: 100%;
-		}
-
-		.logo {
-			width: 280rpx;
-			height: 42rpx;
-			margin-top: -40rpx;
-			// margin-left: 30rpx;
-		}
-
-		.search-btn {
-			height: 66rpx;
-			background: rgba(255, 255, 255, 1);
-			border-radius: 33rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			margin-right: 30rpx;
-
-			.search-icon {
-				width: 60rpx;
-				height: 60rpx;
-				// margin-left: 33rpx;
-			}
-
-			.search-word {
-				font-size: 26rpx;
-				font-weight: 400;
-				color: rgba(153, 153, 153, 1);
-				margin-left: 10rpx;
-			}
-		}
-
-		.tabs-nav-warp {
-			margin-top: 20rpx;
-			padding: 0 30rpx;
-		}
-
-		.tabs-nav {
-			.ul {
-				display: flex;
-
-				.li {
-					flex: 1 0 auto;
-					margin-left: 36rpx;
-					font-size: 30rpx;
-					color: #999999;
-					position: relative;
-					padding-bottom: 18rpx;
-
-					&:first-child {
-						margin-left: 0;
-					}
-
-					&.on {
-						&:after {
-							content: '';
-							width: 100%;
-							height: 4rpx;
-							background: #C5AA7B;
-							position: absolute;
-							left: 0;
-							bottom: 0;
-						}
-
-						font-weight:bold;
-					}
-				}
-			}
-		}
-	}
-
-	.weiXinBox {
-		width: 100%;
-		position: fixed;
-		background: #FFFFFF;
-		z-index: 99;
-	}
-
-	.wxBtnBg {
-		padding: 0 20rpx;
-
-		.weiXinBoxBtn {
-			display: flex;
-			align-items: center;
-			padding: 10rpx 0 10rpx 15rpx;
-			width: 100%;
-			background: #F3F4F5;
-			opacity: 1;
-
-			.search-icon {
-				width: 50rpx;
-				height: 50rpx;
-				margin-right: 20rpx;
-			}
-
-			text {
-				color: #999999;
-			}
-		}
-	}
-
-	.terminal1 {
-		.header {
-			.topBox {
-				// justify-content: left;
-
-				.search-btn {
-					.search-icon {
-						margin-left: 0rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.topTitle {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100rpx;
-		width: 100%;
-
-		.topText {
-			text-align: center;
-			color: #000000;
-			font-size: 38rpx;
-			font-weight: bold;
-		}
-	}
-
-	.topWap {
-		padding-top: 60rpx;
-
-		.logo {
-			margin-top: 0 !important;
-		}
-	}
-
-	.terminal2 {}
-
-	.terminal3 {}
-
-	// 触底样式
-	.reachBottom {
-		margin-top: 30rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.reach-icon {
-			width: 150rpx;
-			height: 150rpx;
-		}
-
-		.reach-text {
-			margin: 20rpx 0;
-			color: #CCCCCC;
-		}
-	}
-	.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;
-	  }
-	}
+<style lang="scss"
+       scoped>
+.header {
+  .toLive {
+    height: 40px;
+    color: #FFF;
+    background-color: #333;
+  }
+
+  .topBox {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  .logo {
+    width: 280rpx;
+    height: 42rpx;
+    margin-top: -40rpx;
+    // margin-left: 30rpx;
+  }
+
+  .search-btn {
+    height: 66rpx;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 33rpx;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-right: 30rpx;
+
+    .search-icon {
+      width: 60rpx;
+      height: 60rpx;
+      // margin-left: 33rpx;
+    }
+
+    .search-word {
+      font-size: 26rpx;
+      font-weight: 400;
+      color: rgba(153, 153, 153, 1);
+      margin-left: 10rpx;
+    }
+  }
+
+  .tabs-nav-warp {
+    margin-top: 20rpx;
+    padding: 0 30rpx;
+  }
+
+  .tabs-nav {
+    .ul {
+      display: flex;
+
+      .li {
+        flex: 1 0 auto;
+        margin-left: 36rpx;
+        font-size: 30rpx;
+        color: #999999;
+        position: relative;
+        padding-bottom: 18rpx;
+
+        &:first-child {
+          margin-left: 0;
+        }
+
+        &.on {
+          &:after {
+            content: '';
+            width: 100%;
+            height: 4rpx;
+            background: #C5AA7B;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+          }
+
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
+
+.weiXinBox {
+  width: 100%;
+  position: fixed;
+  background: #FFFFFF;
+  z-index: 99;
+}
+
+.wxBtnBg {
+  padding: 0 20rpx;
+
+  .weiXinBoxBtn {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0 10rpx 15rpx;
+    width: 100%;
+    background: #F3F4F5;
+    opacity: 1;
+
+    .search-icon {
+      width: 50rpx;
+      height: 50rpx;
+      margin-right: 20rpx;
+    }
+
+    text {
+      color: #999999;
+    }
+  }
+}
+
+.terminal1 {
+  .header {
+    .topBox {
+      // justify-content: left;
+
+      .search-btn {
+        .search-icon {
+          margin-left: 0rpx;
+        }
+      }
+    }
+  }
+}
+
+.topTitle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100rpx;
+  width: 100%;
+
+  .topText {
+    text-align: center;
+    color: #000000;
+    font-size: 38rpx;
+    font-weight: bold;
+  }
+}
+
+.topWap {
+  padding-top: 60rpx;
+
+  .logo {
+    margin-top: 0 !important;
+  }
+}
+
+.terminal2 {
+}
+
+.terminal3 {
+}
+
+// 触底样式
+.reachBottom {
+  margin-top: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .reach-icon {
+    width: 150rpx;
+    height: 150rpx;
+  }
+
+  .reach-text {
+    margin: 20rpx 0;
+    color: #CCCCCC;
+  }
+}
+
+.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;
+  }
+}
 </style>

pages/tabbar/user/index.vue

@@ -1,701 +1,796 @@
 <template>
-	<view class="content">
-		<!-- 我的 -->
-		<image class="top-bg" src="https://ceres.zkthink.com/static/img/user/topBg.png"></image>
-		<view class="page-content">
-			<view class="user-info-box" @click="gologin" v-if="JSON.stringify(item) =='{}' ">
-				<image class="user-image" src="https://ceres.zkthink.com/static/img/user/morentouxiang.png" mode="widthFix"></image>
-				<view class="user-info">
-					<view class="user-logoin-title">点击登录</view>
-					<view class="user-logoin-lable">登录后享受更多权益~</view>
-				</view>
-				<image class="user-info-right" src="https://ceres.zkthink.com/static/img/user/back.png"></image>
-				<view class="notice">
-					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>
-				</view>
-			</view>
-			<view class="user-info-box" v-else>
-				<image class="user-image" @click="goinfo" v-if="useritem.headImage" :src="useritem.headImage"
-					mode="widthFix" style="border-radius: 50%;"></image>
-				<image class="user-image" v-else src="https://ceres.zkthink.com/static/img/user/morentouxiang.png" mode="widthFix">
-				</image>
-				<view class="user-info">
-					<view class="user-logoin-title" v-if="useritem.name">{{useritem.name}}</view>
-					<view class="user-logoin-title" v-else>{{infoitem.phone}}</view>
-					<view class="experience flex-items" @click="goToMemberCenter">
-						<label>成长值</label>
-						<view class="experienceValue">{{useritem.growth || 0}} / {{useritem.nextLevelGrowth || 0}}</view>
-					</view>
-				</view>
-				<view class="notice" @click="toMessage">
-					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead > 99 ? '99+' : useritem.notRead}}</view>
-				</view>
-			</view>
-			<view class="order-box">
-				<view class="order-item" @click="orderTap(1)">
-					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daifukuan1.png" mode="widthFix">
-					</image>
-					<view class="order-item-text">待付款</view>
-					<view class="quan" v-if="useritem.waitPayOrderCount>0">
-						{{useritem.waitPayOrderCount}}
-					</view>
-				</view>
-				<view class="order-item" @click="orderTap(2)">
-					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daifahuo1.png" mode="widthFix">
-					</image>
-					<view class="order-item-text">待发货</view>
-					<view class="quan" v-if="useritem.waitSendOrderCount>0">
-						{{useritem.waitSendOrderCount}}
-					</view>
-
-				</view>
-				<view class="order-item" @click="orderTap(3)">
-					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daishouhuo.png" mode="widthFix">
-					</image>
-					<view class="order-item-text">待收货</view>
-					<view class="quan" v-if="useritem.waitReceiveOrderCount>0">
-						{{useritem.waitReceiveOrderCount}}
-					</view>
-
-				</view>
-				<view class="order-item" @click="orderTap(0)">
-					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/dingdan.png" mode="widthFix"></image>
-					<view class="order-item-text">全部订单</view>
-				</view>
-			</view>
-			<!--			<view class="item-btn mt20" @click="toMessage">-->
-			<!--				<image class="item-btn-icon" src="https://ceres.zkthink.com/static/images/mymessageIcon.png" mode="widthFix"></image>-->
-			<!--				<view class="item-btn-text flex-row-plus flex-items">-->
-			<!--					<label>消息中心</label>-->
-			<!--					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>-->
-			<!--				</view>-->
-			<!--				<image class="item-btn-right" src="https://ceres.zkthink.com/static/img/user/arrow.png" mode="widthFix"></image>-->
-			<!--			</view>-->
-			<view class="itemBox">
-				<view class="item-btn" @click="toCollection">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/mycollectionIcon.png" mode="widthFix">
-					</image>
-					<view class="item-btn-text">我的收藏</view>
-				</view>
-				<view class="item-btn" @click="toQuestion">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myQuestionIcon.png" mode="widthFix">
-					</image>
-					<view class="item-btn-text">我的问答</view>
-				</view>
-				<view class="item-btn" @click="toFootprint">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myfootprintIcon.png" mode="widthFix">
-					</image>
-					<view class="item-btn-text">浏览足迹</view>
-				</view>
-				<view class="item-btn" @click="gouserEvaluate">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/pingjia.png" mode="widthFix"></image>
-					<view class="item-btn-text">我的评价</view>
-				</view>
-				<view class="item-btn" @click="memberAccountClick">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/account.png" mode="widthFix"></image>
-					<view class="item-btn-text">我的账户</view>
-				</view>
-				<view class="item-btn" @click="couponClick">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>
-					<view class="item-btn-text">我的卡券</view>
-				</view>
-				<view class="item-btn" @click="godistribution">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/fenxiao.png" mode="widthFix"></image>
-					<view class="item-btn-text">分销中心</view>
-				</view>
-				<view class="item-btn" @click="applySettle">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/Settled.png" mode="widthFix"></image>
-					<view class="item-btn-text">商家入驻</view>
-				</view>
-			</view>
-			<view class="itemBox">
-				<view class="item-btn" @click="addressClick">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/dizhi1.png" mode="widthFix"></image>
-					<view class="item-btn-text">地址管理</view>
-				</view>
-				<view class="item-btn" @click="goafterSale">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/shouhou.png" mode="widthFix"></image>
-					<view class="item-btn-text">我的售后</view>
-				</view>
-				<view class="item-btn" @click="goToMemberCenter">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/VIP.png" mode="widthFix"></image>
-					<view class="item-btn-text">会员中心</view>
-				</view>
-				<view class="item-btn" @click="goBankcard">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>
-					<view class="item-btn-text">银行卡</view>
-				</view>
-        <view class="item-btn" @click="goIntegral">
-          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myIntegral.png" mode="widthFix"></image>
+  <view class="content">
+    <!-- 我的 -->
+    <image class="top-bg"
+           src="https://ceres.zkthink.com/static/img/user/topBg.png"></image>
+    <view class="page-content">
+      <view class="user-info-box"
+            @click="gologin"
+            v-if="JSON.stringify(item) =='{}' ">
+        <image class="user-image"
+               src="https://ceres.zkthink.com/static/img/user/morentouxiang.png"
+               mode="widthFix"></image>
+        <view class="user-info">
+          <view class="user-logoin-title">点击登录</view>
+          <view class="user-logoin-lable">登录后享受更多权益~</view>
+        </view>
+        <image class="user-info-right"
+               src="https://ceres.zkthink.com/static/img/user/back.png"></image>
+        <view class="notice">
+          <view class="messNum"
+                v-if="useritem.notRead>0">{{ useritem.notRead }}
+          </view>
+        </view>
+      </view>
+      <view class="user-info-box"
+            v-else>
+        <image class="user-image"
+               @click="goinfo"
+               v-if="useritem.headImage"
+               :src="useritem.headImage"
+               mode="widthFix"
+               style="border-radius: 50%;"></image>
+        <image class="user-image"
+               v-else
+               src="https://ceres.zkthink.com/static/img/user/morentouxiang.png"
+               mode="widthFix">
+        </image>
+        <view class="user-info">
+          <view class="user-logoin-title"
+                v-if="useritem.name">{{ useritem.name }}
+          </view>
+          <view class="user-logoin-title"
+                v-else>{{ infoitem.phone }}
+          </view>
+          <view class="experience flex-items"
+                @click="goToMemberCenter">
+            <label>成长值</label>
+            <view class="experienceValue">{{ useritem.growth || 0 }} / {{ useritem.nextLevelGrowth || 0 }}</view>
+          </view>
+        </view>
+        <view class="notice"
+              @click="toMessage">
+          <view class="messNum"
+                v-if="useritem.notRead>0">{{ useritem.notRead > 99 ? '99+' : useritem.notRead }}
+          </view>
+        </view>
+      </view>
+      <view class="order-box">
+        <view class="order-item"
+              @click="orderTap(1)">
+          <image class="order-item-image"
+                 src="https://ceres.zkthink.com/static/img/user/daifukuan1.png"
+                 mode="widthFix">
+          </image>
+          <view class="order-item-text">待付款</view>
+          <view class="quan"
+                v-if="useritem.waitPayOrderCount>0">
+            {{ useritem.waitPayOrderCount }}
+          </view>
+        </view>
+        <view class="order-item"
+              @click="orderTap(2)">
+          <image class="order-item-image"
+                 src="https://ceres.zkthink.com/static/img/user/daifahuo1.png"
+                 mode="widthFix">
+          </image>
+          <view class="order-item-text">待发货</view>
+          <view class="quan"
+                v-if="useritem.waitSendOrderCount>0">
+            {{ useritem.waitSendOrderCount }}
+          </view>
+
+        </view>
+        <view class="order-item"
+              @click="orderTap(3)">
+          <image class="order-item-image"
+                 src="https://ceres.zkthink.com/static/img/user/daishouhuo.png"
+                 mode="widthFix">
+          </image>
+          <view class="order-item-text">待收货</view>
+          <view class="quan"
+                v-if="useritem.waitReceiveOrderCount>0">
+            {{ useritem.waitReceiveOrderCount }}
+          </view>
+
+        </view>
+        <view class="order-item"
+              @click="orderTap(0)">
+          <image class="order-item-image"
+                 src="https://ceres.zkthink.com/static/img/user/dingdan.png"
+                 mode="widthFix"></image>
+          <view class="order-item-text">全部订单</view>
+        </view>
+      </view>
+      <!--			<view class="item-btn mt20" @click="toMessage">-->
+      <!--				<image class="item-btn-icon" src="https://ceres.zkthink.com/static/images/mymessageIcon.png" mode="widthFix"></image>-->
+      <!--				<view class="item-btn-text flex-row-plus flex-items">-->
+      <!--					<label>消息中心</label>-->
+      <!--					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>-->
+      <!--				</view>-->
+      <!--				<image class="item-btn-right" src="https://ceres.zkthink.com/static/img/user/arrow.png" mode="widthFix"></image>-->
+      <!--			</view>-->
+      <view class="itemBox">
+        <view class="item-btn"
+              @click="toCollection">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/mycollectionIcon.png"
+                 mode="widthFix">
+          </image>
+          <view class="item-btn-text">我的收藏</view>
+        </view>
+        <view class="item-btn"
+              @click="toQuestion">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/myQuestionIcon.png"
+                 mode="widthFix">
+          </image>
+          <view class="item-btn-text">我的问答</view>
+        </view>
+        <view class="item-btn"
+              @click="toFootprint">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/myfootprintIcon.png"
+                 mode="widthFix">
+          </image>
+          <view class="item-btn-text">浏览足迹</view>
+        </view>
+        <view class="item-btn"
+              @click="gouserEvaluate">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/pingjia.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">我的评价</view>
+        </view>
+        <view class="item-btn"
+              @click="memberAccountClick">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/account.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">我的账户</view>
+        </view>
+        <view class="item-btn"
+              @click="couponClick">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/kaquan.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">我的卡券</view>
+        </view>
+        <view class="item-btn"
+              @click="godistribution">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/fenxiao.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">分销中心</view>
+        </view>
+        <view class="item-btn"
+              @click="applySettle">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/Settled.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">商家入驻</view>
+        </view>
+      </view>
+      <view class="itemBox">
+        <view class="item-btn"
+              @click="addressClick">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/dizhi1.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">地址管理</view>
+        </view>
+        <view class="item-btn"
+              @click="goafterSale">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/shouhou.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">我的售后</view>
+        </view>
+        <view class="item-btn"
+              @click="goToMemberCenter">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/VIP.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">会员中心</view>
+        </view>
+        <view class="item-btn"
+              @click="goBankcard">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/kaquan.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">银行卡</view>
+        </view>
+        <view class="item-btn"
+              @click="goIntegral">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/myIntegral.png"
+                 mode="widthFix"></image>
           <view class="item-btn-text">我的积分</view>
         </view>
-        <view class="item-btn" @click="goSign">
-          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/signIcon.png" mode="widthFix"></image>
+        <view class="item-btn"
+              @click="goSign">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/signIcon.png"
+                 mode="widthFix"></image>
           <view class="item-btn-text">签到</view>
         </view>
-        <view class="item-btn" @click="goCouponList">
-          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/userCouponIcon.png" mode="widthFix"></image>
+        <view class="item-btn"
+              @click="goCouponList">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/userCouponIcon.png"
+                 mode="widthFix"></image>
           <view class="item-btn-text">优惠券</view>
         </view>
-				<!-- <view class="item-btn">
-						<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/service.png" mode="widthFix"></image>
-						<view class="item-btn-text">平台客服</view>
-					</view> -->
-				<button open-type="contact" class="item-btn btnNone">
-					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/service.png" mode="widthFix"></image>
-					<view class="item-btn-text">平台客服</view>
-				</button>
-
-				<!-- <view class="item-btn" @click="toSuccess">
+        <!-- <view class="item-btn">
+            <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/service.png" mode="widthFix"></image>
+            <view class="item-btn-text">平台客服</view>
+          </view> -->
+        <button open-type="contact"
+                class="item-btn btnNone">
+          <image class="item-btn-icon"
+                 src="https://ceres.zkthink.com/static/img/user/service.png"
+                 mode="widthFix"></image>
+          <view class="item-btn-text">平台客服</view>
+        </button>
+
+        <!-- <view class="item-btn" @click="toSuccess">
           <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/userCouponIcon.png" mode="widthFix"></image>
           <view class="item-btn-text">成功测试</view>
         </view> -->
-<!--        <view class="item-btn" @click="goWxShop">-->
-<!--          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>-->
-<!--          <view class="item-btn-text">测试</view>-->
-<!--        </view>-->
-			</view>
-		</view>
-		<view class="copyright">
-			<text>中科鑫智 版权所有</text>
-			<text>粤ICP备19086489号-3</text>
-		</view>
-	</view>
+        <!--        <view class="item-btn" @click="goWxShop">-->
+        <!--          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>-->
+        <!--          <view class="item-btn-text">测试</view>-->
+        <!--        </view>-->
+      </view>
+    </view>
+    <view class="copyright">
+      <text>中科鑫智 版权所有</text>
+      <text>粤ICP备19086489号-3</text>
+    </view>
+
+    <Loading v-if="false"></Loading>
+  </view>
 </template>
 
 <script>
-	const NET = require('../../../utils/request')
-	const API = require('../../../config/api')
-	const SECRET = require('../../../utils/secret')
-	export default {
-		data() {
-			return {
-				item: {},
-				infoitem: {},
-				useritem: {},
-				isLoading: false,
-				corpId: null,
-				serviceURL: null,
-			}
-		},
-		onLoad() {},
-		onShow() {
-			if (uni.getStorageSync('storage_key')) {
-				this.item = uni.getStorageSync('storage_key');
-			}
-			this.getInfo()
-			this.GetUser()
-		},
-		methods: {
-      // goWxShop() {
-      //   uni.navigateTo({
-      //     url: `plugin-private://wxf0713a10bbae8732/pages/productDetail/productDetail?productId=59656518`,
-      //   })
-      // },
-			// 测试
-			// toSuccess() {
-			// 	uni.navigateTo({
-			// 		url: '../../../pages_category_page1/goodsModule/evaSuccessful'
-			// 		// url: '../../../pages_category_page1/orderModule/paySuccessful'
-			// 	})
-			// },
-			toMessage() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/messageCenter'
-					})
-				}
-			},
-			toCollection() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/collection'
-					})
-				}
-			},
-			toQuestion() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/questionList'
-					})
-				}
-			},
-			toFootprint() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/footprintList'
-					})
-				}
-			},
-			GetUser() {
-				NET.request(API.GetUser, {}, 'GET').then(res => {
-					this.useritem = res.data
-					uni.setStorageSync('storage_userInfo', this.useritem);
-				}).catch(res => {
-
-				})
-			},
-			// 获取会员信息
-			getInfo() {
-				NET.request(API.Info, {
-					token: this.item.token,
-				}, 'GET').then(res => {
-					this.infoitem = res.data
-				}).catch(res => {
-
-				})
-			},
-			// 个人信息  登录页面
-			gologin() {
-				uni.navigateTo({
-					url: '../../../pages_category_page2/userModule/login'
-				})
-			},
-			goinfo() {
-				uni.navigateTo({
-					url: '../../../pages_category_page2/userModule/personalDetails?infoitem=' + JSON.stringify(this
-						.infoitem)
-				})
-			},
-			// 我的评论
-			gouserEvaluate() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page1/goodsModule/userEvaluate'
-					})
-				}
-
-			},
-			// 分销中心
-			godistribution() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page1/distributionModule/index'
-					})
-				}
-			},
-			goToMemberCenter() {
-				uni.navigateTo({
-					url: '../../../pages_category_page1/memberCenter/index'
-				})
-			},
-			applySettle() {
-				const res = uni.getStorageSync('storage_key');
-				let token = SECRET.Encrypt(res.token)
-				let username = this.useritem.name
-				let test = SECRET.Decrypt(token)
-				// #ifdef H5
-				console.log('h5 test')
-				window.open(API.SettledMerchantPrefix + `/#/?username=${username}&user=${token}`)
-				// #endif
-				// #ifdef APP-PLUS
-				plus.runtime.openURL(API.SettledMerchantPrefix + `/#/?username=${username}&user=${token}`, function(e) {
-					console.log(e);
-				})
-				// #endif
-				// #ifdef MP-WEIXIN
-				var url = API.SettledMerchantPrefix
-				uni.navigateTo({
-					url: `../../../pages_category_page1/linkOthers/index?url=${url}&username=${username}&user=${token}`
-					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
-					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
-					// url:'../../../pages_category_page2/userModule/coupon'
-				})
-				// #endif
-				// #ifdef MP-ALIPAY
-				var url = API.SettledMerchantPrefix
-				uni.navigateTo({
-          url: `../../../pages_category_page1/linkOthers/index?url=${url}&username=${username}&user=${token}`
-					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
-					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
-					// url:'../../../pages_category_page2/userModule/coupon'
-				})
-				// #endif
-			},
-			//我的账户
-			memberAccountClick() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/memberAccount'
-					})
-				}
-			},
-			//我的优惠券
-			couponClick() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/coupon'
-					})
-				}
-			},
-			// 地址管理
-			addressClick() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/address'
-					})
-				}
-
-			},
-			// 我的售后
-			goafterSale() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/orderModule/afterSale'
-					})
-				}
-			},
-			// 我的银行卡
-			goBankcard() {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/bankcard'
-					})
-				}
-			},
-      // 我的积分
-      goIntegral() {
-        if (JSON.stringify(this.item) == '{}') {
-          uni.navigateTo({
-            url: '../../../pages_category_page2/userModule/login'
-          })
-        } else {
-          uni.navigateTo({
-            url: '../../../pages_category_page1/integral/index'
-          })
+import Loading from "@/components/Loading"
+
+const NET = require('../../../utils/request')
+const API = require('../../../config/api')
+const SECRET = require('../../../utils/secret')
+export default {
+  components:{Loading},
+  data() {
+    return {
+      item: {},
+      infoitem: {},
+      useritem: {},
+      isLoading: false,
+      corpId: null,
+      serviceURL: null,
+    }
+  },
+  onLoad() {
+  },
+  onShow() {
+    if (uni.getStorageSync('storage_key')) {
+      this.item = uni.getStorageSync('storage_key');
+    }
+    this.getInfo()
+    this.GetUser()
+  },
+  methods: {
+    // goWxShop() {
+    //   uni.navigateTo({
+    //     url: `plugin-private://wxf0713a10bbae8732/pages/productDetail/productDetail?productId=59656518`,
+    //   })
+    // },
+    // 测试
+    // toSuccess() {
+    // 	uni.navigateTo({
+    // 		url: '../../../pages_category_page1/goodsModule/evaSuccessful'
+    // 		// url: '../../../pages_category_page1/orderModule/paySuccessful'
+    // 	})
+    // },
+    toMessage() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/messageCenter'
+        })
+      }
+    },
+    toCollection() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/collection'
+        })
+      }
+    },
+    toQuestion() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/questionList'
+        })
+      }
+    },
+    toFootprint() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/footprintList'
+        })
+      }
+    },
+    GetUser() {
+      NET.request(API.GetUser, {}, 'GET').then(res => {
+        this.useritem = res.data
+        uni.setStorageSync('storage_userInfo', this.useritem);
+      }).catch(res => {
+
+      })
+    },
+    // 获取会员信息
+    getInfo() {
+      NET.request(API.Info, {
+        token: this.item.token,
+      }, 'GET').then(res => {
+        this.infoitem = res.data
+      }).catch(res => {
+
+      })
+    },
+    // 个人信息  登录页面
+    gologin() {
+      uni.navigateTo({
+        url: '../../../pages_category_page2/userModule/login'
+      })
+    },
+    goinfo() {
+      uni.navigateTo({
+        url: '../../../pages_category_page2/userModule/personalDetails?infoitem=' + JSON.stringify(this
+            .infoitem)
+      })
+    },
+    // 我的评论
+    gouserEvaluate() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/goodsModule/userEvaluate'
+        })
+      }
+
+    },
+    // 分销中心
+    godistribution() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/distributionModule/index'
+        })
+      }
+    },
+    goToMemberCenter() {
+      uni.navigateTo({
+        url: '../../../pages_category_page1/memberCenter/index'
+      })
+    },
+    applySettle() {
+      const res = uni.getStorageSync('storage_key');
+      let token = SECRET.Encrypt(res.token)
+      let username = this.useritem.name
+      let test = SECRET.Decrypt(token)
+      // #ifdef H5
+      console.log('h5 test')
+      window.open(API.SettledMerchantPrefix + `/#/?username=${username}&user=${token}`)
+      // #endif
+      // #ifdef APP-PLUS
+      plus.runtime.openURL(API.SettledMerchantPrefix + `/#/?username=${username}&user=${token}`, function (e) {
+        console.log(e);
+      })
+      // #endif
+      // #ifdef MP-WEIXIN
+      var url = API.SettledMerchantPrefix
+      uni.navigateTo({
+        url: `../../../pages_category_page1/linkOthers/index?url=${url}&username=${username}&user=${token}`
+        // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
+        // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
+        // url:'../../../pages_category_page2/userModule/coupon'
+      })
+      // #endif
+      // #ifdef MP-ALIPAY
+      var url = API.SettledMerchantPrefix
+      uni.navigateTo({
+        url: `../../../pages_category_page1/linkOthers/index?url=${url}&username=${username}&user=${token}`
+        // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
+        // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
+        // url:'../../../pages_category_page2/userModule/coupon'
+      })
+      // #endif
+    },
+    //我的账户
+    memberAccountClick() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/memberAccount'
+        })
+      }
+    },
+    //我的优惠券
+    couponClick() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/coupon'
+        })
+      }
+    },
+    // 地址管理
+    addressClick() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/address'
+        })
+      }
+
+    },
+    // 我的售后
+    goafterSale() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/orderModule/afterSale'
+        })
+      }
+    },
+    // 我的银行卡
+    goBankcard() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/bankcard'
+        })
+      }
+    },
+    // 我的积分
+    goIntegral() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/integral/index'
+        })
+      }
+    },
+    // 签到
+    goSign() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/integral/sign'
+        })
+      }
+    },
+    goCouponList() {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/coupon/list'
+        })````
+      }
+    },
+    //判断是否是分销员
+    getApplyState() {
+      NET.request(API.HasApply, {
+        tenantCode: this.currentId
+      }, 'POST').then(res => {
+        uni.hideLoading()
+        this.slist = res.data
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    orderTap(type) {
+      if (JSON.stringify(this.item) == '{}') {
+        uni.navigateTo({
+          url: '../../../pages_category_page2/userModule/login'
+        })
+      } else {
+        uni.navigateTo({
+          url: '../../../pages_category_page1/orderModule/index?type=' + type
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style lang='scss'>
+page {
+  background: #f8f8f8;
+}
+
+.content {
+  height: 100%;
+  position: relative;
+  padding-bottom: 150rpx;
+
+  .itemBox {
+    display: flex;
+    flex-flow: wrap;
+    padding-top: 30rpx;
+    background: #FFFFFF;
+    width: 690rpx;
+    margin: 30rpx auto 0 auto;
+  }
+
+  /* background-color: #f8f8f8; */
+  .top-bg {
+    width: 100%;
+    height: 400rpx;
+    margin-top: -50rpx;
+  }
+
+  .page-content {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    z-index: 10;
+    margin-top: -320upx;
+
+    .user-info-box {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 30upx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      position: relative;
+
+      .notice {
+        width: 60rpx;
+        height: 60rpx;
+        position: absolute;
+        top: 0;
+        right: 50rpx;
+        background: url("https://ceres.zkthink.com/static/images/notice.png") no-repeat center center;
+        background-size: contain;
+
+        .messNum {
+          background: #C83732;
+          border-radius: 50%;
+          color: #FFFFFF;
+          text-align: center;
+          margin: 0rpx 0 0 30rpx;
+          width: 30rpx;
+          height: 30rpx;
+          line-height: 30rpx;
+          font-size: 20rpx;
         }
-      },
-      // 签到
-      goSign() {
-        if (JSON.stringify(this.item) == '{}') {
-          uni.navigateTo({
-            url: '../../../pages_category_page2/userModule/login'
-          })
-        } else {
-          uni.navigateTo({
-            url: '../../../pages_category_page1/integral/sign'
-          })
+      }
+
+      .user-image {
+        width: 126upx;
+        height: 126upx;
+      }
+
+      .user-info {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding-left: 20upx;
+        box-sizing: border-box;
+        z-index: 10;
+
+        .user-logoin-title {
+          font-size: 36upx;
+          font-weight: 500;
+          color: rgba(255, 255, 255, 1);
         }
-      },
-      goCouponList() {
-        if (JSON.stringify(this.item) == '{}') {
-          uni.navigateTo({
-            url: '../../../pages_category_page2/userModule/login'
-          })
-        } else {
-          uni.navigateTo({
-            url: '../../../pages_category_page1/coupon/list'
-          })````
+
+        .user-logoin-lable {
+          font-size: 24upx;
+          font-weight: 400;
+          color: rgba(255, 255, 255, 1);
+          margin-top: 20upx;
         }
-      },
-			//判断是否是分销员
-			getApplyState() {
-				NET.request(API.HasApply, {
-					tenantCode: this.currentId
-				}, 'POST').then(res => {
-					uni.hideLoading()
-					this.slist = res.data
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			orderTap(type) {
-				if (JSON.stringify(this.item) == '{}') {
-					uni.navigateTo({
-						url: '../../../pages_category_page2/userModule/login'
-					})
-				} else {
-					uni.navigateTo({
-						url: '../../../pages_category_page1/orderModule/index?type=' + type
-					})
-				}
-			},
-		}
-	}
-</script>
 
-<style lang='scss'>
-	page {
-		background: #f8f8f8;
-	}
-
-	.content {
-		height: 100%;
-		position: relative;
-		padding-bottom: 150rpx;
-
-		.itemBox {
-			display: flex;
-			flex-flow: wrap;
-			padding-top: 30rpx;
-			background: #FFFFFF;
-			width: 690rpx;
-			margin: 30rpx auto 0 auto;
-		}
-
-		/* background-color: #f8f8f8; */
-		.top-bg {
-			width: 100%;
-			height: 400rpx;
-			margin-top: -50rpx;
-		}
-
-		.page-content {
-			width: 100%;
-			height: 100%;
-			display: flex;
-			flex-direction: column;
-			z-index: 10;
-			margin-top: -320upx;
-
-			.user-info-box {
-				width: 100%;
-				box-sizing: border-box;
-				padding: 30upx;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				position: relative;
-
-				.notice {
-					width: 60rpx;
-					height: 60rpx;
-					position: absolute;
-					top: 0;
-					right: 50rpx;
-					background: url("https://ceres.zkthink.com/static/images/notice.png") no-repeat center center;
-					background-size: contain;
-
-					.messNum {
-						background: #C83732;
-						border-radius: 50%;
-						color: #FFFFFF;
-						text-align: center;
-						margin: 0rpx 0 0 30rpx;
-						width: 30rpx;
-						height: 30rpx;
-						line-height: 30rpx;
-						font-size: 20rpx;
-					}
-				}
-
-				.user-image {
-					width: 126upx;
-					height: 126upx;
-				}
-
-				.user-info {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					padding-left: 20upx;
-					box-sizing: border-box;
-					z-index: 10;
-
-					.user-logoin-title {
-						font-size: 36upx;
-						font-weight: 500;
-						color: rgba(255, 255, 255, 1);
-					}
-
-					.user-logoin-lable {
-						font-size: 24upx;
-						font-weight: 400;
-						color: rgba(255, 255, 255, 1);
-						margin-top: 20upx;
-					}
-
-					.experience {
-						label {
-							font-size: 26rpx;
-							color: #FFFFFF;
-							opacity: 0.7;
-						}
-
-						.experienceValue {
-							width: auto;
-							padding: 0 28rpx;
-							height: 40rpx;
-							font-weight: 400;
-							color: #FFFFFF;
-							border-radius: 25rpx;
-							line-height: 40rpx;
-							border: 2rpx solid rgba(0, 0, 0, 0);
-							background: linear-gradient(88deg, #C5AA7B 0%, #F5DEB2 100%);
-							font-size: 20rpx;
-							margin-left: 20rpx;
-						}
-					}
-				}
-
-				.user-info-right {
-					width: 30upx;
-					height: 30upx;
-				}
-			}
-
-			.order-box {
-				width: 690upx;
-				height: 196upx !important;
-				background: rgba(255, 255, 255, 1);
-				box-shadow: 0px 0px 10upx 0px rgba(51, 51, 51, 0.1);
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				margin-left: 30upx;
-				z-index: 10;
-
-				.order-item {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					position: relative;
-
-					.quan {
-						position: absolute;
-						right: 40upx;
-						top: 10upx;
-						border: 1px solid red;
-						color: #FFFFFF;
-						background-color: red;
-						border-radius: 50%;
-						font-size: 16rpx;
-						width: 30upx;
-						height: 30upx;
-						line-height: 30upx;
-						text-align: center;
-					}
-
-					.order-item-image {
-						width: 90upx;
-						height: 90upx;
-					}
-
-					.order-item-text {
-						font-size: 28upx;
-						margin-top: 10upx;
-						font-weight: 500;
-						color: rgba(102, 102, 102, 1);
-					}
-				}
-			}
-
-			.item-btn {
-				width: 25%;
-				box-sizing: border-box;
-				background-color: #fff;
-				text-align: center;
-				margin-bottom: 40rpx;
-
-				.item-btn-icon {
-					width: 90upx;
-					height: 90upx !important;
-				}
-
-				.item-btn-text {
-					font-size: 28upx;
-					font-weight: 500;
-					flex: 1;
-					color: rgba(102, 102, 102, 1);
-				}
-
-				.messNum {
-					margin-left: 10rpx;
-					font-size: 16rpx;
-					background-color: red;
-					color: #FFFFFF;
-					width: 30rpx;
-					height: 30rpx;
-					border-radius: 50%;
-					margin-top: -5rpx;
-					line-height: 30rpx;
-					text-align: center;
-				}
-
-				.item-btn-right {
-					width: 24upx;
-					height: 24upx;
-				}
-
-			}
-			.btnNone{
-				margin: 0;
-				padding: 0;
-				line-height: normal;
-				&::after{
-					display: none;
-				}
-			}
-
-			.mt20 {
-				margin-top: 20upx;
-			}
-
-			.mt1 {
-				margin-top: 1upx;
-			}
-		}
-
-		.copyright {
-			text-align: center;
-			padding: 30rpx 0 20rpx;
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-
-			text {
-				display: block;
-				font-size: 20rpx;
-				line-height: 30rpx;
-				color: #C5CACF;
-			}
-		}
-	}
+        .experience {
+          label {
+            font-size: 26rpx;
+            color: #FFFFFF;
+            opacity: 0.7;
+          }
+
+          .experienceValue {
+            width: auto;
+            padding: 0 28rpx;
+            height: 40rpx;
+            font-weight: 400;
+            color: #FFFFFF;
+            border-radius: 25rpx;
+            line-height: 40rpx;
+            border: 2rpx solid rgba(0, 0, 0, 0);
+            background: linear-gradient(88deg, #C5AA7B 0%, #F5DEB2 100%);
+            font-size: 20rpx;
+            margin-left: 20rpx;
+          }
+        }
+      }
+
+      .user-info-right {
+        width: 30upx;
+        height: 30upx;
+      }
+    }
+
+    .order-box {
+      width: 690upx;
+      height: 196upx !important;
+      background: rgba(255, 255, 255, 1);
+      box-shadow: 0px 0px 10upx 0px rgba(51, 51, 51, 0.1);
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-left: 30upx;
+      z-index: 10;
+
+      .order-item {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+
+        .quan {
+          position: absolute;
+          right: 40upx;
+          top: 10upx;
+          border: 1px solid red;
+          color: #FFFFFF;
+          background-color: red;
+          border-radius: 50%;
+          font-size: 16rpx;
+          width: 30upx;
+          height: 30upx;
+          line-height: 30upx;
+          text-align: center;
+        }
+
+        .order-item-image {
+          width: 90upx;
+          height: 90upx;
+        }
+
+        .order-item-text {
+          font-size: 28upx;
+          margin-top: 10upx;
+          font-weight: 500;
+          color: rgba(102, 102, 102, 1);
+        }
+      }
+    }
+
+    .item-btn {
+      width: 25%;
+      box-sizing: border-box;
+      background-color: #fff;
+      text-align: center;
+      margin-bottom: 40rpx;
+
+      .item-btn-icon {
+        width: 90upx;
+        height: 90upx !important;
+      }
+
+      .item-btn-text {
+        font-size: 28upx;
+        font-weight: 500;
+        flex: 1;
+        color: rgba(102, 102, 102, 1);
+      }
+
+      .messNum {
+        margin-left: 10rpx;
+        font-size: 16rpx;
+        background-color: red;
+        color: #FFFFFF;
+        width: 30rpx;
+        height: 30rpx;
+        border-radius: 50%;
+        margin-top: -5rpx;
+        line-height: 30rpx;
+        text-align: center;
+      }
+
+      .item-btn-right {
+        width: 24upx;
+        height: 24upx;
+      }
+
+    }
+
+    .btnNone {
+      margin: 0;
+      padding: 0;
+      line-height: normal;
+
+      &::after {
+        display: none;
+      }
+    }
+
+    .mt20 {
+      margin-top: 20upx;
+    }
+
+    .mt1 {
+      margin-top: 1upx;
+    }
+  }
+
+  .copyright {
+    text-align: center;
+    padding: 30rpx 0 20rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+
+    text {
+      display: block;
+      font-size: 20rpx;
+      line-height: 30rpx;
+      color: #C5CACF;
+    }
+  }
+}
 </style>

pages_category_page1/discount/discount.vue

@@ -6,7 +6,9 @@
 <!--      </view>-->
     </view>
 	  <view class="countdown" v-if="shopShowType == false">
-      距活动结束剩余<view class="endDate"><span>{{hou}}</span><i>:</i><span>{{min}}</span><i>:</i><span>{{sec}}</span></view>
+			<label v-if="discountDataList.state">距活动结束剩余</label>
+			<label v-else>即将开始</label>
+			<view class="endDate"><span>{{hou}}</span><i>:</i><span>{{min}}</span><i>:</i><span>{{sec}}</span></view>
 	  </view>
 <!--	  <view class="filterBox" v-else>-->
 <!--		<view class="item" :class="selectIndex == 0 ? 'selected' : ''" @click="synthesize"><span>综合</span></view>-->
@@ -57,12 +59,18 @@
                 <label class="fs36">{{item.price}}</label>
               </view>
             </view>
-            <view class="snapUpBtn" @click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
+            <view v-if="discountDataList.state" class="snapUpBtn" @click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
               <view class="btnText">去抢购</view>
               <view style="width: 82%;margin: 0 auto">
                 <progress activeColor="#FFFFFF" :percent="getPercent(20, 100)" active stroke-width="5" />
               </view>
             </view>
+						<view v-else class="snapUpBtn btnStyle1">
+						  <view class="btnText">即将开始</view>
+						  <view style="width: 82%;margin: 0 auto">
+						    <progress activeColor="#FFFFFF" :percent="getPercent(20, 100)" active stroke-width="5" />
+						  </view>
+						</view>
           </view>
         </view>
       </view>
@@ -88,11 +96,12 @@ export default {
 			sec: "00",
 			shopId:0,
 			shopSeckillId:0,
-			type:1,//价格
-			volume:1,//销量
+			type:0,//价格
+			volume:0,//销量
 			shopShowType:false,
 			selectIndex:0,
-      sortIndex: 0
+      sortIndex: 1,
+			discountDataList:{},
 		}
 	},
 	onLoad(options) {
@@ -127,16 +136,24 @@ export default {
     sortTap(index){
       this.page = 1
       this.getDiscount = []
+			this.sortIndex = index
       if(index == 1){
-        this.type = 1
-        this.volume = 1
-        this.sortIndex = index
+        this.type = 0
+        this.volume = 0
       }else if(index == 2){
-        this.type = this.type != 1 ? 1:2
-        this.sortIndex = index
+				this.volume = 0
+				if(this.type===0){
+					this.type = 1
+				}else{
+					this.type = this.type != 1 ? 1:2
+				}
       }else if(index == 3){
-        this.volume = this.volume != 1 ? 1:2
-        this.sortIndex = index
+				this.type = 0
+				if(this.volume === 0){
+					this.volume = 1
+				}else{
+					this.volume = this.volume != 1 ? 1:2
+				}		
       }
       this.getDiscountList()
     },
@@ -188,9 +205,17 @@ export default {
         type:this.type,
         volume:this.volume
       }
+			uni.showLoading({
+				title:'数据加载中...'
+			})
 			NET.request(API.getDiscountList,param,'GET').then(res => {
+				this.discountDataList = res.data
 				if(this.shopShowType == false){
-					this.dateformat(res.data.time)
+					if(this.discountDataList.state){
+						this.dateformat(res.data.time)
+					}else{
+						this.dateformat(res.data.enableTime)
+					}
 					this.countDown()
 				}
 				if(res.data.page.list.length == 0){
@@ -199,7 +224,9 @@ export default {
 				}else{
 					this.getDiscount = this.getDiscount.concat(res.data.page.list)
 				}
+				uni.hideLoading()
 			}).catch(res => {
+				uni.hideLoading()
 				uni.showToast({
 					title:'失败',
 					icon:"none"
@@ -233,15 +260,15 @@ export default {
 		      let netxHou = hou;
 
 		      if (netxHou == 0 && netxMin == 0 && netxSec == -1) {
-		        clearTimeout(timeOut)
-				uni.switchTab({
-					url:'../../pages/tabbar/index/index'
-				})
-				uni.showToast({
-					title:"活动结束",
-					duration:2000,
-					icon:'none'
-				})
+								clearTimeout(timeOut)
+						uni.switchTab({
+							url:'../../pages/tabbar/index/index'
+						})
+						uni.showToast({
+							title:"活动结束",
+							duration:2000,
+							icon:'none'
+						})
 		      } else {
 		        if (netxSec == -1) {
 		          netxSec = 59
@@ -422,6 +449,10 @@ page {
                 border-radius: 10rpx;
               }
             }
+						.btnStyle1{
+							background: linear-gradient(90deg, #29C790 0%, #75D98C 100%);
+							box-shadow: 0 6rpx 12rpx rgba(52, 203, 144, 0.3);
+						}
           }
         }
       }

pages_category_page1/discount/groupBuy.vue

@@ -4,7 +4,9 @@
      <image src="https://ceres.zkthink.com/static/images/groupBuyLogo.png"></image>
    </view>
 	 <view class="countdown" v-if="shopShowType == false">
-	   距结束<view class="endDate"><span>{{hou}}</span><i>:</i><span>{{min}}</span><i>:</i><span>{{sec}}</span></view>
+		 <label v-if="groupDataList.state === 1">距结束剩余</label>
+		 <label v-else>即将开始</label>
+	   <view class="endDate"><span>{{hou}}</span><i>:</i><span>{{min}}</span><i>:</i><span>{{sec}}</span></view>
 	 </view>
 <!--	 <view class="filterBox" v-else>-->
 <!--		 <view class="item" :class="selectIndex == 0 ? 'selected' : ''" @click="synthesize"><span>综合</span></view>-->
@@ -51,12 +53,18 @@
                <label class="fs36">{{item.price}}</label>
              </view>
            </view>
-           <view class="snapUpBtn" @click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
+           <view v-if="groupDataList.state === 1" class="snapUpBtn" @click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
              <view class="btnText">去拼团</view>
              <view style="width: 82%;margin: 0 auto">
                <progress activeColor="#FFFFFF" :percent="getPercent(5, 10)" active stroke-width="5" />
              </view>
            </view>
+					 <view v-else class="snapUpBtn btnStyle1">
+					   <view class="btnText">即将开始</view>
+					   <view style="width: 82%;margin: 0 auto">
+					     <progress activeColor="#FFFFFF" :percent="getPercent(5, 10)" active stroke-width="5" />
+					   </view>
+					 </view>
          </view>
        </view>
      </view>
@@ -84,12 +92,13 @@ export default {
 			sec: "00",
 			shopId:0,
 			shopGroupWorkId:0,
-			type:1,//价格
-			volume:1,//销量
+			type:0,//价格
+			volume:0,//销量
 			shopShowType:false,
 			selectIndex:0,
-      sortIndex: 0,
-      ifEmpty: false
+      sortIndex: 1,
+      ifEmpty: false,
+			groupDataList:{},
 		}
 	},
 	onLoad(options) {
@@ -102,9 +111,10 @@ export default {
 			this.shopId = 0
 			this.shopGroupWorkId = 0
 		}
-		
+
 	},
 	onShow() {
+    this.groupBuy=[]
 		this.getGroupBuylist()
 	},
 	onReachBottom(){
@@ -161,16 +171,24 @@ export default {
     sortTap(index){
       this.page = 1
       this.groupBuy = []
+			this.sortIndex = index
       if(index == 1){
-        this.type = 1
-        this.volume = 1
-        this.sortIndex = index
+        this.type = 0
+        this.volume = 0
       }else if(index == 2){
-        this.type = this.type != 1 ? 1:2
-        this.sortIndex = index
+				this.volume = 0
+				if(this.type === 0){
+					this.type = 1
+				}else{
+					this.type = this.type != 1 ? 1:2
+				}
       }else if(index == 3){
-        this.volume = this.volume != 1 ? 1:2
-        this.sortIndex = index
+        this.type = 0
+        if(this.volume === 0){
+        	this.volume = 1
+        }else{
+        	this.volume = this.volume != 1 ? 1:2
+        }
       }
       this.getGroupBuylist()
     },
@@ -198,6 +216,7 @@ export default {
 					this.loadingType = 1
 					this.page = this.page
 				}else{
+					this.groupDataList = res.data
 					this.groupBuy = this.groupBuy.concat(res.data.page.list)
           if (this.groupBuy.length === 0) {
             this.ifEmpty = true
@@ -415,6 +434,10 @@ page {
               border-radius: 10rpx;
             }
           }
+					.btnStyle1{
+						background: linear-gradient(90deg, #29C790 0%, #75D98C 100%);
+						box-shadow: 0 6rpx 12rpx rgba(52, 203, 144, 0.3);
+					}
         }
       }
     }

pages_category_page1/discount/spikeList.vue

@@ -21,10 +21,16 @@
 			</view>
 		</view>
 		<view v-else class="shopStopTime">
-			<label v-if="currentTime > timestamp">距离结束：</label>
-			<label v-else>距离开始：</label>
-			<u-count-down :timestamp="shopEndTime" fontSize="24rpx" separatorColor="#C83732"
-			separatorSize="24rpx" bgColor="#C83732" color="#ffffff" height="200rpx"></u-count-down>
+			<view v-if="spikeLikeData.state === 1">
+				<label>距离结束：</label>
+				<u-count-down :timestamp="spikeLikeData.time" fontSize="24rpx" separatorColor="#C83732"
+				separatorSize="24rpx" bgColor="#C83732" color="#ffffff" height="200rpx"></u-count-down>
+			</view>
+			<view  v-else>
+				<label>距离开始：</label>
+				<u-count-down :timestamp="spikeLikeData.enableTime" fontSize="24rpx" separatorColor="#C83732"
+				separatorSize="24rpx" bgColor="#C83732" color="#ffffff" height="200rpx"></u-count-down>
+			</view>
 		</view>
 		<view class="spikeList mar-top-20">
 			<view class="listItem" v-for="(item,index) in spikeLikeList" :key="index">
@@ -34,7 +40,7 @@
 				<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 v-else class="number">限量件 {{item.limitNumber}} / 剩余{{item.stockNumber}}件</view>
 					<view class="originalPrice">原价: ¥{{item.originalPrice}}</view>
 					<view class="price">
 						<view class="currentPrice flex-items font-color-FF7800">
@@ -46,7 +52,7 @@
 								<label class="fs36">{{item.price}}</label>
 							</view>
 						</view>
-						<view class="snapUpBtn" v-if="currentTime > timestamp"
+						<view class="snapUpBtn" v-if="spikeLikeData.state === 1 || platformSeckillList[platformIndex].state===3"
 							@click="gogoodsDetails(item.shopId,item.productId,item.skuId)">
 							<view class="btnText">去抢购</view>
 							<view class="progressBox">
@@ -54,22 +60,14 @@
 									active stroke-width="5" />
 							</view>
 						</view>
-						<view class="snapUpBtn" :class="{btnStyle1: currentTime < timestamp}"
-							v-if="currentTime < timestamp">
+						<view class="snapUpBtn" :class="{btnStyle1: spikeLikeData.state === 0 || spikeLikeData.ifEnable === 2 || platformSeckillList[platformIndex].state===2}"
+							v-if="spikeLikeData.state === 0 || spikeLikeData.ifEnable === 2 || platformSeckillList[platformIndex].state===2">
 							<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>
@@ -116,8 +114,9 @@
 				active: 0,
 				timestamp: null,
 				endTime: null,
-				shopEndTime:null,
-				
+				platformSeckillId: 0,
+				platformSeckillList:[],
+				platformIndex:0,
 			}
 		},
 		onLoad(options) {
@@ -140,7 +139,10 @@
 			this.pageSize= 10,
 			this.querySessionData = []
 			this.spikeLikeList = []
-			this.getQuerySession()			
+			this.getQuerySession()
+			if(!this.shopId){
+				this.getQueryPlatformSeckillData()
+			}
 		},
 		tabChange(key, value) {
 			this.activeTab = key
@@ -156,7 +158,7 @@
 				uni.stopPullDownRefresh()
 			} else {
 				this.page = this.page + 1
-				this.getSpikeLike()
+				// this.getSpikeLike()
 			}
 		},
 		methods: {
@@ -169,11 +171,51 @@
 					this.pageSize = 10
 					this.session = item.time.substring(0, 16)
 					this.spikeLikeList = []
-					this.getSpikeLike()
+					// this.getSpikeLike()
+					this.platformSeckillId = this.platformSeckillList[index].seckillId
+					this.platformIndex = index
+					this.getPlatformSeckillsData(index)
 					this.timestamp = item.timestamp
 					this.endTime = item.endTime
 				}
 			},
+			// 查询秒杀列表
+			getQueryPlatformSeckillData(){
+				NET.request(API.getQueryPlatformSeckillList,'GET').then(res => {
+					this.platformSeckillList = res.data
+					this.platformSeckillId = res.data[0].seckillId
+					this.getPlatformSeckillsData(0)
+				}).catch(err => {
+					uni.showToast({
+						title:'失败',
+						icon:'none'
+					})
+				})
+			},
+			// 根据seckillId查询对应的秒杀商品列表
+			getPlatformSeckillsData(index){
+				uni.showLoading({
+					mask: true,
+					title: '数据加载中...',
+				})
+				NET.request(API.getPlatformSeckills,{ seckillId:this.platformSeckillId },'GET').then(res => {
+				 uni.hideLoading()
+			   if(res.data[0].products === 0){
+					 this.loadingType = 1
+					 this.page = this.page
+				 }else{
+					 this.spikeLikeList = res.data[index].products
+				 }
+				}).catch(err => {
+					uni.hideLoading()
+					uni.showToast({
+						title:'失败',
+						icon:'none'
+					})
+				})
+			},
+			
+			// 根据时间查询
 			queryProductListBySession() {
 				NET.request(API.querySession, {
 					page: this.sessionPage,
@@ -248,7 +290,7 @@
 			getSpikeLike() {
 				uni.showLoading({
 					mask: true,
-					title: 'Loading...',
+					title: '数据加载中...',
 				})
 				let param = ''
 				param = {
@@ -259,10 +301,6 @@
 				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
@@ -281,7 +319,7 @@
 			getShopSeckillList(){
 				uni.showLoading({
 					mask: true,
-					title: 'Loading...',
+					title: '数据加载中...',
 				})
 				let param = ''
 				param = {
@@ -293,7 +331,6 @@
 				NET.request(API.getShopSeckillIndex, param, 'GET').then(res => {
 					uni.hideLoading()
 					this.spikeLikeData = res.data
-					this.shopEndTime = res.data.time
 					if (res.data.page.list.length === 0) {
 						this.loadingType = 1
 						this.page = this.page

pages_category_page1/goodsModule/evaluateDetails.vue

@@ -41,11 +41,13 @@
 				</view>
 			</view>
 		</view>
+<!--    {{commentVOList}}-->
 		<view class="linkBox">
 			<view class="butBox flex-row-plus" v-if="commentVOList.addComment != ''">
 				<view class="addPraise-box1 flex-items-plus" @click="zanTap">
-					<image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png"></image>
-					<label class="mar-left-10 font-color-FFEBC4">点赞</label>
+          <image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png" v-if="!commentVOList.ifLike"/>
+          <image class="addPraise-icon" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-03-10/415f93719fa64af58b8d7cafb734ec4a_22.png" v-else/>
+          <label :class="['mar-left-10',commentVOList.ifLike?'font-color-FFEBC4':'font-color-DDD']">点赞</label>
 				</view>
 			</view>
 			<view class="butBox flex-row-plus" v-else>
@@ -54,8 +56,9 @@
 					<label class="mar-left-10 font-color-333">追加评价</label>
 				</view>
 				<view class="addPraise-box flex-items-plus" @click="zanTap">
-					<image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png"></image>
-					<label class="mar-left-10 font-color-FFEBC4">点赞</label>
+					<image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png" v-if="!commentVOList.ifLike"/>
+          <image class="addPraise-icon" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-03-10/415f93719fa64af58b8d7cafb734ec4a_22.png" v-else/>
+					<label :class="['mar-left-10',commentVOList.ifLike?'font-color-FFEBC4':'font-color-DDD']">点赞</label>
 				</view>
 			</view>
 		</view>
@@ -111,6 +114,9 @@
       },
 			//点赞
 			zanTap(){
+        uni.showLoading({
+          title:''
+        })
 				this.actionType = this.commentVOList.ifLike == 1 ?0:1
 				NET.request(API.LikeOrUnLikeComment,{
 				  commentId: this.commentVOList.commentId,
@@ -130,13 +136,13 @@
 					}
 				}).catch(res => {
 				  uni.hideLoading()
-				})
+				}).finally(()=>{uni.hideLoading()})
 			},
 			//追加评论
 			addCommentsClick(){
 				uni.setStorageSync('addCommentVOList', this.commentVOList);
 				uni.navigateTo({
-					url:'addEvaluate'
+					url:'addEvaluate?type=2'
 				})
 			},
       // 查看图片

pages_category_page1/goodsModule/goodsDetails.vue

@@ -1,3035 +1,3207 @@
 <template>
-	<view class="container" v-if="ifShow" @scroll="onDetailScroll">
-		<!-- 商品详情 -->
-		<view>
-			<swiper class="goodsImgswiper-box" :indicator-dots="true" :autoplay="true">
-				<swiper-item v-for="(imgItem, index) in productData.images" :key="index">
-					<image class="goodsImg" :src='imgItem'></image>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="share-box flex-items-plus" @click="clickShare">
-			<image class="share-img" src="https://ceres.zkthink.com/static/images/shareBut.png"></image>
-			<label class="fs24 mar-left-5">分享</label>
-		</view>
-		<view class="goodgDes-box flex-start flex-column">
-			<view v-if="selectedSku.activityType === 0"
-				class="priceBuyNum-box flex-display flex-sp-between mar-left-30">
-				<view>
-					<label class="fs36 font-color-C83732">¥</label>
-					<label class="fs36 fs-bold font-color-C83732 mar-left-10">{{selectedSku.price || 0}}</label>
-					<label class="fs24 font-color-999 discountsPriceLine mar-left-20">¥
-						{{selectedSku.originalPrice || 0}}</label>
-				</view>
-				<label class="fs24 font-color-999">{{productData.users || 0}}人付款</label>
-			</view>
-			<view v-else-if="selectedSku.activityType === 8" class="sceneMarketingBox">
-				<view class="flex-row-plus flex-items-plus mar-left-30 mar-top-10">
-					<label class="fs30 font-color-FFF">¥</label>
-					<label class="fs42 mar-left-5 font-color-FFF">{{selectedSku.price || 0}}</label>
-					<label class="fs28 mar-left-10 discountsPriceLine font-color-CCC">¥
-						{{selectedSku.originalPrice || 0}}</label>
-				</view>
-				<view class="sceneNameBox">{{productData.sceneName}}</view>
-			</view>
-			<view v-else class="seckill-box">
-				<view class="flex-items flex-sp-between" v-if="selectedSku.activityType === 9 ">
-					<view class="vipImg flex-items">
-						<image class="vip-icon" src="https://ceres.zkthink.com/static/images/vipDetail.png" mode="">
-						</image>
-					</view>
-					<view class="flex-row-plus flex-items-plus mar-left-30 mar-top-10">
-						<label class="fs30 font-color-FFF">¥</label>
-						<label class="fs42 mar-left-5 font-color-FFF">{{selectedSku.price || 0}}</label>
-						<label class="fs28 mar-left-10 discountsPriceLine font-color-999">¥
-							{{selectedSku.originalPrice || 0}}</label>
-					</view>
-				</view>
-				<view v-else class="flex-items flex-row flex-sp-between">
-					<view class="flex-column-plus">
-						<image v-if="[2,4].includes(selectedSku.activityType)" class="seckill-icon"
-							src="https://ceres.zkthink.com/static/images/seckillicon.png" mode=""></image>
-						<image v-if="[3,5].includes(selectedSku.activityType)" class="discount-icon"
-							src="https://ceres.zkthink.com/static/images/discounticon.png" mode=""></image>
-						<image v-if="selectedSku.activityType === 1" class="spell-icon"
-							src="https://ceres.zkthink.com/static/images/spellicon.png" mode=""></image>
-						<view class="flex-row-plus flex-items mar-top-10">
-							<label class="fs30 font-color-FFF">¥</label>
-							<label class="fs42 mar-left-5 font-color-FFF">{{selectedSku.price || 0}}</label>
-							<label class="fs28 mar-left-10 discountsPriceLine font-color-999">¥
-								{{selectedSku.originalPrice || 0}}</label>
-						</view>
-					</view>
-					<view v-if="[1,2,3,4,5].includes(selectedSku.activityType)" class="countdown flex-column-plus">
-						<view v-if="timeActivetype">
-							<label class="fs28">距离结束剩余</label>
-							<view class="flex-row-plus fs34 flex-items-plus mar-top-10">
-								<view class="countdown-box flex-items-plus">{{hou}}</view>
-								<view class="font-color-999">:</view>
-								<view class="countdown-box flex-items-plus">{{min}}</view>
-								<view class="font-color-999">:</view>
-								<view class="countdown-box flex-items-plus">{{sec}}</view>
-							</view>
-						</view>
-						<view v-else>
-							<label class="fs28 mar-right-20">即将开始：{{selectedSku.startTime}}</label>
-							<!--              <view class="fs28 mar-right-20 mar-top-20">{{productData.startTime}}</view>-->
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="nameContainer">
-				<view class="goodsName-box overflowNoDot mar-top-30 mar-left-30">
-					<label class="goodsName fs32 mar-left-20">{{productData.productName}}</label>
-				</view>
-				<view class="collectBox" @click="collectProduct">
-					<image v-if="productData.ifCollect === 1" class="store-icon"
-						src="https://ceres.zkthink.com/static/images/shoucangActive1.png"></image>
-					<image v-else class="store-icon" src="https://ceres.zkthink.com/static/images/shoucang2x.png">
-					</image>
-					<label class="fs22">收藏</label>
-				</view>
-			</view>
-			<view v-if="markTools.length>0 || shopMarkTools.length>0" class="activity-box mar-top-10"
-				@click="couponShowClick">
-				<label class="fs24 font-color-999">优惠</label>
-				<view class="activity-content mar-left-30 flex-items flex-sp-between flex-row">
-					<view class="fs20 overflow" style="width: 500rpx;">
-						{{productData.couponSplicing}}
-					</view>
-					<view class="flex-items">
-						<label class="fs24 font-color-C5AA7B">领券</label>
-						<image class="coupon-arrow" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="express-box flex-items flex-row fs24">
-			<label class="fs24 font-color-999 mar-right-20">发货</label>
-			<image src="https://ceres.zkthink.com/static/images/mapIcon.png"
-				v-if="productData.receive && productData.receive.receiveAdress"></image>
-			<label class="mar-left-10 mapName mar-right-30"
-				v-if="productData.receive && productData.receive.receiveAdress">{{productData.receive.receiveAdress}}</label>
-			<label>快递：¥ {{productData.logisticsPrice || 0}}</label>
-		</view>
-		<view class="fs24 chooseSize-box flex-start" @click="goodsDetailShowClick(6)">
-			<view class="chooseSize-content flex-items flex-row flex-sp-between">
-				<view class="flex-row-plus">
-					<label class="fs26 mar-left-30 font-color-999">选择</label>
-					<view class="valueBox mar-left-20 flex-items">
-						<view class="mar-right-10" v-for="(item, index) of currentSuk" :key="index">{{item.skuText}}
-						</view>
-					</view>
-				</view>
-				<image class="arrow-icon" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
-			</view>
-		</view>
-		<!--结合销售-->
-		<combined-sales :pid="productId" :productData="productData"></combined-sales>
-		<!--拼团-->
-		<view v-if="selectedSku.activityType === 1" class="borRig-line-20"></view>
-		<view v-if="selectedSku.activityType === 1&&topThreeCollageOrders.length > 0" class="goodsDiscount">
-			<view class="questionTit mar-left-30 flex-items flex-row flex-sp-between">
-				<label class="">这些人正在拼单</label>
-				<view class="allMoreBox">
-					<view v-if="topThreeCollageOrders.length > 0" class="allMore" @click="openAllBuy">查看全部</view>
-					<view v-else class="allMore" @click="openAllBuyTwo">查看全部</view>
-					<image class="evaluateAllArrow-icon mar-left-10"
-						src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
-				</view>
-			</view>
-			<view class="groupBuy" v-for="(Gitem, index) in topThreeCollageOrders" :key="index">
-				<view class="groupBuyList" v-if="Gitem.time > 0">
-					<view class="groupBuyItem">
-						<view class="leftAvatar">
-							<img :src="Gitem.headImage" alt="">
-							<span>{{Gitem.name}}</span>
-						</view>
-						<view class="rightInfo">
-							<view class="groupBuyTime" style="width: 70%;">
-								<view class="needPeople flex-row-plus">还差<b>{{Gitem.person}}人</b>拼成</view>
-								<view class="endDate">剩余{{timeChange(Gitem.time)}}</view>
-							</view>
-							<view class="groupBuyBtn" @click="getGroupShow(Gitem.collageId)">和Ta拼
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--    组合支付-->
-		<view class="borRig-line-20"></view>
-		<view class="evaQaTab flex-items flex-sp-around">
-			<view :class="{active: activeTab === 1}" class="evaBtn" @click="changeTabs( 1)">
-				<view class="tabTit">宝贝评价 ({{commentListLength}})</view>
-			</view>
-			<view :class="{active: activeTab === 2}" class="qaBtn" @click="changeTabs( 2)">
-				<view class="tabTit">商品问答（{{problemsListLength}}）</view>
-			</view>
-		</view>
-		<view class="evaluate-box flex-start flex-column" v-show="activeTab === 1">
-			<view class="evaluateTag-box" v-if="commentListLength>0">
-				<view class="evaluateTag-text">
-					全部({{commentListLength}})
-				</view>
-			</view>
-			<view class="evaluate-contentbox mar-top-30" v-for="(commentItem, index) in commentList" :key="index">
-				<view class="evaluate-content flex-items flex-row flex-sp-between">
-					<view class="flex-items">
-						<image class="user-headSmallImg" :src="commentItem.headImage"></image>
-						<label class="fs28 mar-left-20">{{commentItem.name}}</label>
-					</view>
-					<label class="font-color-999 fs22">{{commentItem.createTime}}</label>
-				</view>
-				<view class="evaluateDes-box">
-					<label class="evaluateDes">{{commentItem.comment}}</label>
-				</view>
-				<view class="item-image-box" v-if="commentItem.image">
-					<view v-for="(ItemImg, cindex) in commentImgData(commentItem.image)" :key="cindex">
-						<image @click='previewImg(index,cindex)' class="img-item" :src="ItemImg"></image>
-					</view>
-				</view>
-				<view class="item-line"></view>
-				<view class="item-like-box" v-if="commentItem.addComment !== ''">
-					<view class="addEvaluate">
-						<view>追加评价：{{commentItem.addComment}}</view>
-						<view class="item-image-box" v-if="commentItem.addImages">
-							<view v-for="(itemAddImg, imgIndex) in commentItem.addImages" :key="imgIndex">
-								<image @click='previewAddImg(index,imgIndex)' class="img-item" :src="itemAddImg">
-								</image>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="like-box">
-					<image class="like-img" @click="zanTap(index, commentItem.commentId,0)"
-						src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png"
-						v-if="commentItem.ifLike === 1"></image>
-					<image class="like-img" @click="zanTap(index, commentItem.commentId,1)"
-						src="https://ceres.zkthink.com/static/images/praiseIcon.png" v-else></image>
-					<view class="like-num">{{commentItem.likes}}</view>
-				</view>
-			</view>
-			<view class="moreBox" v-if="commentListLength>0" @click="commentAll">
-				<label class="fs24">查看全部</label>
-				<image class="evaluateAllArrow-icon mar-left-10"
-					src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
-			</view>
-		</view>
-		<!--    评价END-->
-		<!--    问答-->
-		<view class="borRig-line-20"></view>
-		<view class="questions" v-show="activeTab === 2">
-			<view class="questionInfo flex-items flex-row flex-sp-between">
-				<view class="infoTit">宝贝好不好，问问已买过的人</view>
-				<view class="putQuestion" @click="goToQuestions">去提问</view>
-			</view>
-			<view class="listBox">
-				<view class="itemBox" v-for="(pitem,index) in getProblemsList" :key="index">
-					<view class="itemAsk">
-						<i>问</i><span>{{pitem.problem}}</span>
-					</view>
-					<view v-if="pitem.answers.length>0">
-						<view class="answer" v-for="(witem,index) in twonumansers(pitem.answers)" :key="index">
-							<view class="answerBox">
-								<i>答</i><span>{{witem.answer}}</span>
-							</view>
-							<view class="answerBtn" v-if="pitem.ifAnswer === 1" @click="seeAllFn(pitem.problemId)">立即回答
-							</view>
-						</view>
-					</view>
-					<view v-else>
-						<view class="answer">
-							<view class="answerBox">
-								<i>答</i><span>暂无答复</span>
-							</view>
-							<view class="answerBtn" v-if="pitem.ifAnswer === 1" @click="seeAllFn(pitem.problemId)">立即回答
-							</view>
-						</view>
-					</view>
-					<view v-if="pitem.answers.length>1" class="seeAll" @click="seeAllFn(pitem.problemId)">查看全部答复</view>
-				</view>
-				<view class="moreBox" v-if="problemsListLength>0" @click="seeAllQa">
-					<label class="fs24">查看全部</label>
-					<image class="evaluateAllArrow-icon mar-left-10"
-						src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
-				</view>
-			</view>
-		</view>
-		<view class="inStore-box flex-items flex-row flex-sp-between">
-			<view class="flex-display flex-row">
-				<view>
-					<image @click="goStore" class="inStore-logo" :src="productData.shopLogo"></image>
-				</view>
-				<view class="flex-display flex-column mar-left-20">
-					<label @click="goStore">{{productData.shopName}}</label>
-					<view class="flex-display flex-row fs24 font-color-999 mar-top-5">
-						<label>商品总类：{{productData.classifyNumber}}</label>
-						<label class="mar-left-30">已售：{{productData.number}}件</label>
-					</view>
-				</view>
-			</view>
-			<view class="inStore-but" @click="goStore">去逛逛</view>
-		</view>
-		<view class="goodsDetails-box">
-			<view class="goodsDetails-title">
-				<view class="goodsDetails-Line"></view>
-				<label class="goodsDetails-text">宝贝详情</label>
-				<view class="goodsDetails-Line"></view>
-			</view>
-			<view class="goodsDetailsimg-box">
-				<view class="">
-					<rich-text :nodes="sellDescList"></rich-text>
-				</view>
-			</view>
-		</view>
-		<view class="buygoods-box">
-			<view class="buygoodsBut-box flex-row-plus" :style="{'height':(isIphone === true? 160:130)+'rpx'}">
-				<view class="btns_container">
-					<view class="btns flex-column-plus" @click="goStore">
-						<image class="store-icon" src="https://ceres.zkthink.com/static/images/storeIcon.png"></image>
-						<label class="fs22">店铺</label>
-					</view>
-					<!-- #ifdef MP-WEIXIN -->
-					<view v-if="hasService" class="btns flex-column-plus mar-left-10" @click="flyToService">
-						<image class="store-icon"
-							src="https://ceres.zkthink.com/static/images/service-product-detail.png"></image>
-						<label class="fs22">客服</label>
-					</view>
-					<!-- #endif -->
-					<view class="btns flex-column-plus mar-left-10 flex-items Cart" @click="goshopCart">
-						<view class="cartAllNum" v-if="allCartNum>0">{{allCartNum}}</view>
-						<image class="store-icon" src="https://ceres.zkthink.com/static/images/gouwuche.png"></image>
-						<label class="fs22">购物车</label>
-					</view>
-				</view>
-				<view class="btns_container">
-					<view class="flex-row-plus offShelf" v-if="productData.shelveState === 0">
-						商品已下架
-					</view>
-					<view class="flex-row-plus flex-items" v-else-if="selectedSku.activityType === 1">
-						<view class="joinShopCartBut" @click="goodsDetailShowClick(4)">单独购买</view>
-						<view class="buyNowBut" @click="goodsDetailShowClick(3)">我要开团</view>
-					</view>
-					<view class="flex-row-plus flex-items" v-else>
-						<view class="joinShopCartBut" @click="goodsDetailShowClick(1)">加入购物车</view>
-						<view class="buyNowBut" @click="goodsDetailShowClick(2)">立即购买</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="returnTopService-box">
-			<view class="returnTop-box flex-items-plus flex-column" @click="top"
-				:style="{'display':(returnTopFlag===true? 'flex':'none')}">
-				<image class="returnTopImg" src="https://ceres.zkthink.com/static/images/backTop.png"></image>
-			</view>
-		</view>
-		<!-- 商品详情 -->
-		<u-popup v-model="goodsDetailShowFlag" mode="bottom" border-radius="14">
-			<view class="goosDetailshow-box">
-				<view class="detailImg-box flex-row-plus">
-					<image class="detailImg" :src="selectedSku.image"></image>
-					<view class="flex-column-plus mar-left-40">
-						<view class="font-color-C5AA7B">
-							<label class="fs24">¥</label>
-							<label class="fs36 mar-left-10"
-								v-text="selectedSku.activityType === 1 && btnType === 4 ? selectedSku.originalPrice : selectedSku.price"></label>
-						</view>
-						<label class="fs24 font-color-999 mar-top-20">库存 {{selectedSku.stockNumber}} 件</label>
-						<label class="fs24 mar-top-20">已选</label>
-					</view>
-				</view>
-				<view class="color-box flex-column-plus">
-					<view v-for="(attritem,index) in productData.names" :key="index">
-						<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"
-									:class="{'colorName-on' : selectedAttr[attritem.nameCode] == attrRes.valueCode}"
-									@click="nameCodeValueCodeClick(attritem.nameCode, attrRes.valueCode, true)">
-									{{attrRes.skuValue}}
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="goodsNumCent">
-					<view class="goodsNum-box flex-row-plus flex-sp-between" :class="{'bottom-line' :supportHuabei}">
-						<label class="font-color-333 fs26">数量</label>
-						<view class="goodsNum">
-							<view class="item subtract" @click="numSub()">-</view>
-							<view class="item goodsNumber" v-model="buyNum">{{buyNum}}</view>
-							<view class="item add" @click.stop="numAdd()">+</view>
-						</view>
-					</view>
-				</view>
-				<view class="huabei-box flex-column-plus" v-if="supportHuabei">
-					<label class="font-color-999 fs24">花呗分期</label>
-					<scroll-view class="fenqi-box" scroll-x="true">
-						<view class="huabei-item"
-							:class="[{'fenqi-on' :fenqiIndex === 0},{'disabled' :disableFenqiList[0]}]"
-							@click="selectFenqi(0)">
-							<label class="huabei-period">分3期(含手续费)</label>
-							<label class="huabei-money">￥{{fenqiMoneyList[0]}}/期</label>
-						</view>
-						<view class="huabei-item"
-							:class="[{'fenqi-on' :fenqiIndex === 1},{'disabled' :disableFenqiList[1]}]"
-							@click="selectFenqi(1)">
-							<label class="huabei-period">分6期(含手续费)</label>
-							<label class="huabei-money">￥{{fenqiMoneyList[1]}}/期</label>
-						</view>
-						<view class="huabei-item"
-							:class="[{'fenqi-on' :fenqiIndex === 2},{'disabled' :disableFenqiList[2]}]"
-							@click="selectFenqi(2)">
-							<label class="huabei-period">分12期(含手续费)</label>
-							<label class="huabei-money">￥{{fenqiMoneyList[2]}}/期</label>
-						</view>
-					</scroll-view>
-				</view>
-				<view v-if="ifSkuSelect" class="skuSelectBtn">
-					<view class="flex-row-plus offShelf" v-if="productData.shelveState === 0">
-						商品已下架
-					</view>
-					<view class="flex-row-plus flex-items flex-sp-around" v-else-if="selectedSku.activityType === 1">
-						<view class="selectJoinShop selectBtn font-color-333" @click="addFast(2)">单独购买</view>
-						<view class="selectBuyNow selectBtn font-color-FFEBC4" @click="getGroupSettlement(1)">我要开团
-						</view>
-					</view>
-					<view class="flex-row-plus flex-items flex-sp-around" v-else>
-						<view class="selectJoinShop selectBtn font-color-333" @click="addCart">加入购物车</view>
-						<view class="selectBuyNow selectBtn font-color-FFEBC4" @click="addFast(2)">立即购买</view>
-					</view>
-				</view>
-				<view v-else>
-					<view v-if="selectedSku.activityType === 1 && collageId !== 0"
-						class="goosDetailbut-box flex-items-plus"
-						:style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
-						<view class="joinbuyBut" @click="getGroupSettlement(2)">确定</view>
-					</view>
-					<view v-else-if="selectedSku.activityType === 1 && btnType === 3"
-						class="goosDetailbut-box flex-row-plus"
-						:style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
-						<view class="buyNowBut" @click="getGroupSettlement(1)">去拼团</view>
-					</view>
-					<view v-else class="goosDetailbut-box flex-row-plus"
-						:style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
-						<view v-if="btnType === 1" class="buyNowBut" @click="addCart">确认</view>
-						<view v-else class="buyNowBut" @click="addFast(2)">确认</view>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<!-- 优惠券弹框 -->
-		<coupon-popup ref="couponPopup" :markTools="markTools" :shopMarkTools="shopMarkTools" :setTop="topLeft"
-			:currentActive="currentActive"></coupon-popup>
-		<!-- 拼单弹框 -->
-		<u-popup class="popupDiscount" v-model="showGroupBuyList" mode="center" border-radius="14"
-			close-icon-pos="top-right" close-icon-size="20">
-			<view class="popupDiscountTit">这些人正在拼单</view>
-			<view class="groupBuy">
-				<view class="groupBuyList">
-					<scroll-view style="height: 480upx;" scroll-y>
-						<view class="groupBuyItem1" v-for="(aitem,index) in selectedSku.collageOrders" :key="index">
-							<view class="leftAvatar" v-if="aitem.time > 0">
-								<img :src="aitem.headImage" alt="">
-								<view class="groupBuyTime">
-									<view class="needPeople"><span>{{aitem.name}}</span>还差<b>{{aitem.person}}人</b>
-									</view>
-									<view class="endDate">剩余{{timeChange(aitem.time)}}</view>
-								</view>
-							</view>
-							<view class="rightInfo" v-if="aitem.time > 0">
-								<view class="groupBuyBtn" @click="getGroupShow(aitem.collageId)">和Ta拼</view>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
+  <view class="container"
+        v-if="ifShow"
+        @scroll="onDetailScroll">
+    <!-- 商品详情 -->
+    <view>
+      <swiper class="goodsImgswiper-box"
+              :indicator-dots="true"
+              :autoplay="true">
+        <swiper-item v-for="(imgItem, index) in productData.images"
+                     :key="index">
+          <image class="goodsImg"
+                 :src='imgItem'></image>
+        </swiper-item>
+      </swiper>
+    </view>
+    <view class="share-box flex-items-plus"
+          @click="clickShare">
+      <image class="share-img"
+             src="https://ceres.zkthink.com/static/images/shareBut.png"></image>
+      <label class="fs24 mar-left-5">分享</label>
+    </view>
+    <view class="goodgDes-box flex-start flex-column">
+      <view v-if="selectedSku.activityType === 0"
+            class="priceBuyNum-box flex-display flex-sp-between mar-left-30">
+        <view>
+          <label class="fs36 font-color-C83732">¥</label>
+          <label class="fs36 fs-bold font-color-C83732 mar-left-10">{{ selectedSku.price || 0 }}</label>
+          <label class="fs24 font-color-999 discountsPriceLine mar-left-20">¥
+                                                                            {{ selectedSku.originalPrice || 0 }}</label>
+        </view>
+        <label class="fs24 font-color-999">{{ productData.users || 0 }}人付款</label>
+      </view>
+      <view v-else-if="selectedSku.activityType === 8"
+            class="sceneMarketingBox">
+        <view class="flex-row-plus flex-items-plus mar-left-30 mar-top-10">
+          <label class="fs30 font-color-FFF">¥</label>
+          <label class="fs42 mar-left-5 font-color-FFF">{{ selectedSku.price || 0 }}</label>
+          <label class="fs28 mar-left-10 discountsPriceLine font-color-CCC">¥
+                                                                            {{ selectedSku.originalPrice || 0 }}</label>
+        </view>
+        <view class="sceneNameBox">{{ productData.sceneName }}</view>
+      </view>
+      <view v-else
+            class="seckill-box">
+        <view class="flex-items flex-sp-between"
+              v-if="selectedSku.activityType === 9 ">
+          <view class="vipImg flex-items">
+            <image class="vip-icon"
+                   src="https://ceres.zkthink.com/static/images/vipDetail.png"
+                   mode="">
+            </image>
+          </view>
+          <view class="flex-row-plus flex-items-plus mar-left-30 mar-top-10">
+            <label class="fs30 font-color-FFF">¥</label>
+            <label class="fs42 mar-left-5 font-color-FFF">{{ selectedSku.price || 0 }}</label>
+            <label class="fs28 mar-left-10 discountsPriceLine font-color-999">¥
+                                                                              {{ selectedSku.originalPrice || 0
+                                                                              }}</label>
+          </view>
+        </view>
+        <view v-else
+              class="flex-items flex-row flex-sp-between">
+          <view class="flex-column-plus">
+            <image v-if="[2,4].includes(selectedSku.activityType)"
+                   class="seckill-icon"
+                   src="https://ceres.zkthink.com/static/images/seckillicon.png"
+                   mode=""></image>
+            <image v-if="[3,5].includes(selectedSku.activityType)"
+                   class="discount-icon"
+                   src="https://ceres.zkthink.com/static/images/discounticon.png"
+                   mode=""></image>
+            <image v-if="selectedSku.activityType === 1"
+                   class="spell-icon"
+                   src="https://ceres.zkthink.com/static/images/spellicon.png"
+                   mode=""></image>
+            <view class="flex-row-plus flex-items mar-top-10">
+              <label class="fs30 font-color-FFF">¥</label>
+              <label class="fs42 mar-left-5 font-color-FFF">{{ selectedSku.price || 0 }}</label>
+              <label class="fs28 mar-left-10 discountsPriceLine font-color-999">¥
+                                                                                {{ selectedSku.originalPrice || 0
+                                                                                }}</label>
+            </view>
+          </view>
+          <view v-if="[1,2,3,4,5].includes(selectedSku.activityType)"
+                class="countdown flex-column-plus">
+            <view v-if="timeActivetype">
+              <label class="fs28">距离结束剩余</label>
+              <view class="flex-row-plus fs34 flex-items-plus mar-top-10">
+                <view class="countdown-box flex-items-plus">{{ hou }}</view>
+                <view class="font-color-999">:</view>
+                <view class="countdown-box flex-items-plus">{{ min }}</view>
+                <view class="font-color-999">:</view>
+                <view class="countdown-box flex-items-plus">{{ sec }}</view>
+              </view>
+            </view>
+            <view v-else>
+              <label class="fs28 mar-right-20">即将开始：{{ selectedSku.startTime }}</label>
+              <!--              <view class="fs28 mar-right-20 mar-top-20">{{productData.startTime}}</view>-->
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="nameContainer">
+        <view class="goodsName-box overflowNoDot mar-top-30 mar-left-30">
+          <label class="goodsName fs32 mar-left-20">{{ productData.productName }}</label>
+        </view>
+        <view class="collectBox"
+              @click="collectProduct">
+          <image v-if="productData.ifCollect === 1"
+                 class="store-icon"
+                 src="https://ceres.zkthink.com/static/images/shoucangActive1.png"></image>
+          <image v-else
+                 class="store-icon"
+                 src="https://ceres.zkthink.com/static/images/shoucang2x.png">
+          </image>
+          <label class="fs22">收藏</label>
+        </view>
+      </view>
+      <view v-if="markTools.length>0 || shopMarkTools.length>0"
+            class="activity-box mar-top-10"
+            @click="couponShowClick">
+        <label class="fs24 font-color-999">优惠</label>
+        <view class="activity-content mar-left-30 flex-items flex-sp-between flex-row">
+          <view class="fs20 overflow"
+                style="width: 500rpx;">
+            {{ productData.couponSplicing }}
+          </view>
+          <view class="flex-items">
+            <label class="fs24 font-color-C5AA7B">领券</label>
+            <image class="coupon-arrow"
+                   src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="express-box flex-items flex-row fs24">
+      <label class="fs24 font-color-999 mar-right-20">发货</label>
+      <image src="https://ceres.zkthink.com/static/images/mapIcon.png"
+             v-if="productData.receive && productData.receive.receiveAdress"></image>
+      <label class="mar-left-10 mapName mar-right-30"
+             v-if="productData.receive && productData.receive.receiveAdress">{{ productData.receive.receiveAdress
+                                                                             }}</label>
+      <label>快递：¥ {{ productData.logisticsPrice || 0 }}</label>
+    </view>
+    <view class="fs24 chooseSize-box flex-start"
+          @click="goodsDetailShowClick(6)">
+      <view class="chooseSize-content flex-items flex-row flex-sp-between">
+        <view class="flex-row-plus">
+          <label class="fs26 mar-left-30 font-color-999">选择</label>
+          <view class="valueBox mar-left-20 flex-items">
+            <view class="mar-right-10"
+                  v-for="(item, index) of currentSuk"
+                  :key="index">{{ item.skuText }}
+            </view>
+          </view>
+        </view>
+        <image class="arrow-icon"
+               src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
+      </view>
+    </view>
+    <!--结合销售-->
+    <combined-sales :pid="productId"
+                    :productData="productData"></combined-sales>
+    <!--拼团-->
+    <view v-if="selectedSku.activityType === 1"
+          class="borRig-line-20"></view>
+    <view v-if="selectedSku.activityType === 1&&topThreeCollageOrders.length > 0"
+          class="goodsDiscount">
+      <view class="questionTit mar-left-30 flex-items flex-row flex-sp-between">
+        <label class="">这些人正在拼单</label>
+        <view class="allMoreBox">
+          <view v-if="topThreeCollageOrders.length > 0"
+                class="allMore"
+                @click="openAllBuy">查看全部
+          </view>
+          <view v-else
+                class="allMore"
+                @click="openAllBuyTwo">查看全部
+          </view>
+          <image class="evaluateAllArrow-icon mar-left-10"
+                 src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
+        </view>
+      </view>
+      <view class="groupBuy"
+            v-for="(Gitem, index) in topThreeCollageOrders"
+            :key="index">
+        <view class="groupBuyList"
+              v-if="Gitem.time > 0">
+          <view class="groupBuyItem">
+            <view class="leftAvatar">
+              <img :src="Gitem.headImage"
+                   alt="">
+              <span>{{ Gitem.name }}</span>
+            </view>
+            <view class="rightInfo">
+              <view class="groupBuyTime"
+                    style="width: 70%;">
+                <view class="needPeople flex-row-plus">还差<b>{{ Gitem.person }}人</b>拼成</view>
+                <view class="endDate">剩余{{ timeChange(Gitem.time) }}</view>
+              </view>
+              <view class="groupBuyBtn"
+                    @click="getGroupShow(Gitem.collageId)">和Ta拼
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!--    组合支付-->
+    <view class="borRig-line-20"></view>
+    <view class="evaQaTab flex-items flex-sp-around">
+	  <view :class="{active: activeTab === 1}"
+	        class="evaBtn"
+	        @click="changeTabs(1)">
+	    <view class="tabTit">宝贝评价（{{ commentListLength }}）</view>
+	  </view>
+      <view :class="{active: activeTab === 2}"
+            class="qaBtn"
+            @click="changeTabs(2)">
+        <view class="tabTit">商品问答（{{ problemsListLength }}）</view>
+      </view>
+    </view>
+    <view class="evaluate-box flex-start flex-column"
+          v-show="activeTab === 1">
+      <view class="evaluateTag-box"
+            v-if="commentListLength>0">
+        <view class="evaluateTag-text">
+          全部({{ commentListLength }})
+        </view>
+      </view>
+      <view class="evaluate-contentbox mar-top-30"
+            v-for="(commentItem, index) in commentList"
+            :key="index">
+        <view class="evaluate-content flex-items flex-row flex-sp-between">
+          <view class="flex-items">
+            <image class="user-headSmallImg"
+                   :src="commentItem.headImage"></image>
+            <label class="fs28 mar-left-20">{{ commentItem.name }}</label>
+          </view>
+          <label class="font-color-999 fs22">{{ commentItem.createTime }}</label>
+        </view>
+        <view class="evaluateDes-box">
+          <label class="evaluateDes">{{ commentItem.comment }}</label>
+        </view>
+        <view class="item-image-box"
+              v-if="commentItem.image">
+          <view v-for="(ItemImg, cindex) in commentImgData(commentItem.image)"
+                :key="cindex">
+            <image @click='previewImg(index,cindex)'
+                   class="img-item"
+                   :src="ItemImg"></image>
+          </view>
+        </view>
+        <view class="item-line"></view>
+        <view class="item-like-box"
+              v-if="commentItem.addComment !== ''">
+          <view class="addEvaluate">
+            <view>追加评价：{{ commentItem.addComment }}</view>
+            <view class="item-image-box"
+                  v-if="commentItem.addImages">
+              <view v-for="(itemAddImg, imgIndex) in commentItem.addImages"
+                    :key="imgIndex">
+                <image @click='previewAddImg(index,imgIndex)'
+                       class="img-item"
+                       :src="itemAddImg">
+                </image>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="like-box">
+          <image class="like-img"
+                 @click="zanTap(index, commentItem.commentId,0)"
+                 src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png"
+                 v-if="commentItem.ifLike === 1"></image>
+          <image class="like-img"
+                 @click="zanTap(index, commentItem.commentId,1)"
+                 src="https://ceres.zkthink.com/static/images/praiseIcon.png"
+                 v-else></image>
+          <view class="like-num">{{ commentItem.likes }}</view>
+        </view>
+      </view>
+      <view class="moreBox"
+            v-if="commentListLength>0"
+            @click="commentAll">
+        <label class="fs24">查看全部</label>
+        <image class="evaluateAllArrow-icon mar-left-10"
+               src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
+      </view>
+    </view>
+    <!--    评价END-->
+    <!--    问答-->
+    <view class="borRig-line-20"></view>
+    <view class="questions"
+          v-show="activeTab === 2">
+      <view class="questionInfo flex-items flex-row flex-sp-between">
+        <view class="infoTit">宝贝好不好，问问已买过的人</view>
+        <view class="putQuestion"
+              @click="goToQuestions">去提问
+        </view>
+      </view>
+      <view class="listBox">
+        <view class="itemBox"
+              v-for="(pitem,index) in getProblemsList"
+              :key="index">
+          <view class="itemAsk">
+            <i>问</i><span>{{ pitem.problem }}</span>
+          </view>
+          <view v-if="pitem.answers.length>0">
+            <view class="answer"
+                  v-for="(witem,index) in twonumansers(pitem.answers)"
+                  :key="index">
+              <view class="answerBox">
+                <i>答</i><span>{{ witem.answer }}</span>
+              </view>
+              <view class="answerBtn"
+                    v-if="pitem.ifAnswer === 1"
+                    @click="seeAllFn(pitem.problemId)">立即回答
+              </view>
+            </view>
+          </view>
+          <view v-else>
+            <view class="answer">
+              <view class="answerBox">
+                <i>答</i><span>暂无答复</span>
+              </view>
+              <view class="answerBtn"
+                    v-if="pitem.ifAnswer === 1"
+                    @click="seeAllFn(pitem.problemId)">立即回答
+              </view>
+            </view>
+          </view>
+          <view v-if="pitem.answers.length>1"
+                class="seeAll"
+                @click="seeAllFn(pitem.problemId)">查看全部答复
+          </view>
+        </view>
+        <view class="moreBox"
+              v-if="problemsListLength>0"
+              @click="seeAllQa">
+          <label class="fs24">查看全部</label>
+          <image class="evaluateAllArrow-icon mar-left-10"
+                 src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
+        </view>
+      </view>
+    </view>
+    <view class="inStore-box flex-items flex-row flex-sp-between">
+      <view class="flex-display flex-row">
+        <view>
+          <image @click="goStore"
+                 class="inStore-logo"
+                 :src="productData.shopLogo"></image>
+        </view>
+        <view class="flex-display flex-column mar-left-20">
+          <label @click="goStore">{{ productData.shopName }}</label>
+          <view class="flex-display flex-row fs24 font-color-999 mar-top-5">
+            <label>商品总类：{{ productData.classifyNumber }}</label>
+            <label class="mar-left-30">已售：{{ productData.number }}件</label>
+          </view>
+        </view>
+      </view>
+      <view class="inStore-but"
+            @click="goStore">去逛逛
+      </view>
+    </view>
+    <view class="goodsDetails-box">
+      <view class="goodsDetails-title">
+        <view class="goodsDetails-Line"></view>
+        <label class="goodsDetails-text">宝贝详情</label>
+        <view class="goodsDetails-Line"></view>
+      </view>
+      <view class="goodsDetailsimg-box">
+        <view class="">
+          <rich-text :nodes="sellDescList"></rich-text>
+        </view>
+      </view>
+    </view>
+    <view class="buygoods-box">
+      <view class="buygoodsBut-box flex-row-plus"
+            :style="{'height':(isIphone === true? 160:130)+'rpx'}">
+        <view class="btns_container">
+          <view class="btns flex-column-plus"
+                @click="goStore">
+            <image class="store-icon"
+                   src="https://ceres.zkthink.com/static/images/storeIcon.png"></image>
+            <label class="fs22">店铺</label>
+          </view>
+          <!-- #ifdef MP-WEIXIN -->
+          <view v-if="hasService"
+                class="btns flex-column-plus mar-left-10"
+                @click="flyToService">
+            <image class="store-icon"
+                   src="https://ceres.zkthink.com/static/images/service-product-detail.png"></image>
+            <label class="fs22">客服</label>
+          </view>
+          <!-- #endif -->
+          <view class="btns flex-column-plus mar-left-10 flex-items Cart"
+                @click="goshopCart">
+            <view class="cartAllNum"
+                  v-if="allCartNum>0">{{ allCartNum }}
+            </view>
+            <image class="store-icon"
+                   src="https://ceres.zkthink.com/static/images/gouwuche.png"></image>
+            <label class="fs22">购物车</label>
+          </view>
+        </view>
+        <view class="btns_container">
+          <view class="flex-row-plus offShelf"
+                v-if="productData.shelveState === 0">
+            商品已下架
+          </view>
+          <view class="flex-row-plus flex-items"
+                v-else-if="selectedSku.activityType === 1">
+            <view class="joinShopCartBut"
+                  @click="goodsDetailShowClick(4)">单独购买
+            </view>
+            <view class="buyNowBut"
+                  @click="goodsDetailShowClick(3)">我要开团
+            </view>
+          </view>
+          <view class="flex-row-plus flex-items"
+                v-else>
+            <view class="joinShopCartBut"
+                  @click="goodsDetailShowClick(1)">加入购物车
+            </view>
+            <view class="buyNowBut"
+                  @click="goodsDetailShowClick(2)">立即购买
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="returnTopService-box">
+      <view class="returnTop-box flex-items-plus flex-column"
+            @click="top"
+            :style="{'display':(returnTopFlag===true? 'flex':'none')}">
+        <image class="returnTopImg"
+               src="https://ceres.zkthink.com/static/images/backTop.png"></image>
+      </view>
+    </view>
+    <!-- 商品详情 -->
+    <u-popup v-model="goodsDetailShowFlag"
+             mode="bottom"
+             border-radius="14">
+      <view class="goosDetailshow-box">
+        <view class="detailImg-box flex-row-plus">
+          <image class="detailImg"
+                 :src="selectedSku.image"></image>
+          <view class="flex-column-plus mar-left-40">
+            <view class="font-color-C5AA7B">
+              <label class="fs24">¥</label>
+              <label class="fs36 mar-left-10"
+                     v-text="selectedSku.activityType === 1 && btnType === 4 ? selectedSku.originalPrice : selectedSku.price"></label>
+            </view>
+            <label class="fs24 font-color-999 mar-top-20">库存 {{ selectedSku.stockNumber }} 件</label>
+            <label class="fs24 mar-top-20">已选</label>
+          </view>
+        </view>
+        <view class="color-box flex-column-plus">
+          <view v-for="(attritem,index) in productData.names"
+                :key="index">
+            <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"
+                      :class="{'colorName-on' : selectedAttr[attritem.nameCode] == attrRes.valueCode}"
+                      @click="nameCodeValueCodeClick(attritem.nameCode, attrRes.valueCode, true)">
+                  {{ attrRes.skuValue }}
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="goodsNumCent">
+          <view class="goodsNum-box flex-row-plus flex-sp-between"
+                :class="{'bottom-line' :supportHuabei}">
+            <label class="font-color-333 fs26">数量</label>
+            <view class="goodsNum">
+              <view class="item subtract"
+                    @click="numSub()">-
+              </view>
+              <view class="item goodsNumber"
+                    v-model="buyNum">{{ buyNum }}
+              </view>
+              <view class="item add"
+                    @click="numAdd()">+
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="huabei-box flex-column-plus"
+              v-if="supportHuabei">
+          <label class="font-color-999 fs24">花呗分期</label>
+          <scroll-view class="fenqi-box"
+                       scroll-x="true">
+            <view class="huabei-item"
+                  :class="[{'fenqi-on' :fenqiIndex === 0},{'disabled' :disableFenqiList[0]}]"
+                  @click="selectFenqi(0)">
+              <label class="huabei-period">分3期(含手续费)</label>
+              <label class="huabei-money">￥{{ fenqiMoneyList[0] }}/期</label>
+            </view>
+            <view class="huabei-item"
+                  :class="[{'fenqi-on' :fenqiIndex === 1},{'disabled' :disableFenqiList[1]}]"
+                  @click="selectFenqi(1)">
+              <label class="huabei-period">分6期(含手续费)</label>
+              <label class="huabei-money">￥{{ fenqiMoneyList[1] }}/期</label>
+            </view>
+            <view class="huabei-item"
+                  :class="[{'fenqi-on' :fenqiIndex === 2},{'disabled' :disableFenqiList[2]}]"
+                  @click="selectFenqi(2)">
+              <label class="huabei-period">分12期(含手续费)</label>
+              <label class="huabei-money">￥{{ fenqiMoneyList[2] }}/期</label>
+            </view>
+          </scroll-view>
+        </view>
+        <view v-if="ifSkuSelect"
+              class="skuSelectBtn">
+          <view class="flex-row-plus offShelf"
+                v-if="productData.shelveState === 0">
+            商品已下架
+          </view>
+          <view class="flex-row-plus flex-items flex-sp-around"
+                v-else-if="selectedSku.activityType === 1">
+            <view class="selectJoinShop selectBtn font-color-333"
+                  @click="addFast(2)">单独购买
+            </view>
+            <view class="selectBuyNow selectBtn font-color-FFEBC4"
+                  @click="getGroupSettlement(1)">我要开团
+            </view>
+          </view>
+          <view class="flex-row-plus flex-items flex-sp-around"
+                v-else>
+            <view class="selectJoinShop selectBtn font-color-333"
+                  @click="addCart">加入购物车
+            </view>
+            <view class="selectBuyNow selectBtn font-color-FFEBC4"
+                  @click="addFast(2)">立即购买
+            </view>
+          </view>
+        </view>
+        <view v-else>
+          <view v-if="selectedSku.activityType === 1 && collageId !== 0"
+                class="goosDetailbut-box flex-items-plus"
+                :style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
+            <view class="joinbuyBut"
+                  @click="getGroupSettlement(2)">确定
+            </view>
+          </view>
+          <view v-else-if="selectedSku.activityType === 1 && btnType === 3"
+                class="goosDetailbut-box flex-row-plus"
+                :style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
+            <view class="buyNowBut"
+                  @click="getGroupSettlement(1)">去拼团
+            </view>
+          </view>
+          <view v-else
+                class="goosDetailbut-box flex-row-plus"
+                :style="{'padding-bottom':(isIphone === true? 60:20)+'rpx'}">
+            <view v-if="btnType === 1"
+                  class="buyNowBut"
+                  @click="addCart">确认
+            </view>
+            <view v-else
+                  class="buyNowBut"
+                  @click="addFast(2)">确认
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+    <!-- 优惠券弹框 -->
+    <coupon-popup ref="couponPopup"
+                  :markTools="markTools"
+                  :shopMarkTools="shopMarkTools"
+                  :setTop="topLeft"
+                  :currentActive="currentActive"></coupon-popup>
+    <!-- 拼单弹框 -->
+    <u-popup class="popupDiscount"
+             v-model="showGroupBuyList"
+             mode="center"
+             border-radius="14"
+             close-icon-pos="top-right"
+             close-icon-size="20">
+      <view class="popupDiscountTit">这些人正在拼单</view>
+      <view class="groupBuy">
+        <view class="groupBuyList">
+          <scroll-view style="height: 480upx;"
+                       scroll-y>
+            <view class="groupBuyItem1"
+                  v-for="(aitem,index) in selectedSku.collageOrders"
+                  :key="index">
+              <view class="leftAvatar"
+                    v-if="aitem.time > 0">
+                <img :src="aitem.headImage"
+                     alt="">
+                <view class="groupBuyTime">
+                  <view class="needPeople"><span>{{ aitem.name }}</span>还差<b>{{ aitem.person }}人</b>
+                  </view>
+                  <view class="endDate">剩余{{ timeChange(aitem.time) }}</view>
+                </view>
+              </view>
+              <view class="rightInfo"
+                    v-if="aitem.time > 0">
+                <view class="groupBuyBtn"
+                      @click="getGroupShow(aitem.collageId)">和Ta拼
+                </view>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	import UButton from "../../uview-ui/components/u-button/u-button";
-	import CombinedSales from "@/components/activities/combinedSales";
-	import CouponPopup from "../../components/goodsDetalils/coupon-popup";
-
-	const NET = require('../../utils/request')
-	const API = require('../../config/api')
-	export default {
-		components: {
-			CouponPopup,
-			CombinedSales,
-			UButton,
-		},
-		data() {
-			return {
-				screenHeight: 0,
-				isIphone: "",
-				returnTopFlag: false,
-				goodsDetailShowFlag: false,
-				colorActiveId: 1,
-				modelNumActiveId: 1,
-				parameterShowFlag: false,
-				couponShowFlag: false,
-				couponActiveFlag: 1,
-				succeedShowFlag: false,
-				productId: '',
-				shopGroupWorkId: null,
-				paramSkuId: '',
-				productData: {
-					logisticsPrice: 0
-				},
-				productCommentTotal: 0,
-				commentKeywordVOList: [],
-				buyNum: 1,
-				storeDTO: {}, //店铺信息
-				storeId: '',
-				id: '',
-				storeName: '',
-				selectedSku: {
-					originalPrice: 0
-				},
-				commentList: [],
-				commentListLength: 0,
-				sellDescList: '',
-				couponListLength: 0,
-
-				promotionType: 1,
-				commentImgList: [],
-				showVOList: [],
-				promotionIds: '',
-				couponList: [],
-				isShowSuccess: false,
-				selectedAttr: {},
-				showGroupBuyList: false,
-				topThreeCollageOrders: {}, //拼单数据
-				getProblemsList: [], //商品问答数据
-				problemsPage: 1,
-				problemsPageSize: 2,
-				timeActivetype: true,
-				hou: "00",
-				min: "00",
-				sec: "00",
-				countdownInterval: undefined,
-				funtimeOut: undefined,
-				collageId: 0,
-				problemsListLength: 0,
-				ticker: null,
-				ifWork: 0, //是否拼团商品单独购买
-				shopDiscountId: 0,
-				shopSeckillId: 0,
-				btnType: 1,
-				fenqiIndex: -1,
-				disableFenqiList: [false, false, false],
-				fenqiMoneyList: ["0.00", "0.00", "0.00"],
-				supportHuabei: false,
-				salesId: 0, //分销员id
-				activeTab: 1,
-				// 组合支付
-				swiperOption: {
-					slidesPerView: 3, // 显示数量
-					spaceBetween: 0, // 间隔
-					autoplay: false, // 可选选项，自动滑动
-					loop: true,
-					pagination: {
-						el: '.group-pagination'
-					},
-					navigation: {
-						nextEl: '.swiper-button-next',
-						prevEl: '.swiper-button-prev'
-					}
-				},
-				allCartNum: 0,
-				currentSuk: [],
-				isLoading: false,
-				hasService: false,
-				corpId: null, // 企业ID
-				serviceURL: null, // 客服链接
-				ifSkuSelect: false,
-				markTools: [], //平台优惠券
-				shopMarkTools: [], //店铺优惠券
-				ifShow: false,
-				topLeft: 0,
-				currentActive: 0
-			}
-		},
-		computed: {
-			getcarNum() {
-				this.allCartNum = uni.getStorageSync('allCartNum')
-			}
-		},
-		created() {
-			if (this.countdownInterval) {
-				clearInterval(this.countdownInterval)
-			}
-			if (this.ticker) { //这一段是防止进入页面出去后再进来计时器重复启动
-				clearInterval(this.ticker);
-			}
-			if (this.funtimeOut) {
-				clearTimeout(this.funtimeOut)
-			}
-			if (this.allCartNum > 99) {
-				this.allCartNum = '...'
-			}
-		},
-		onLoad(options) {
-			console.log("options----", options)
-			this.isIphone = getApp().globalData.isIphone;
-			if (getApp().globalData.productShareItem) {
-				const item = getApp().globalData.productShareItem
-				this.shopId = parseInt(item.shopId)
-				this.productId = item.productId
-				this.paramSkuId = item.skuId
-				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
-				this.salesId = parseInt(options.salesId)
-			}
-			// 判断是否是拼团
-			if (options.shopGroupWorkId) {
-				this.shopGroupWorkId = options.shopGroupWorkId
-			}
-			this.queryProductDetail()
-			this.bindSalesCustomer(this.salesId, this.shopId)
-			this.getProblems()
-			this.allCartNum = uni.getStorageSync('allCartNum')
-			this.getServiceUrl()
-		},
-		onUnload() {
-			if (this.countdownInterval) {
-				clearInterval(this.countdownInterval)
-			}
-			if (this.ticker) { //这一段是防止进入页面出去后再进来计时器重复启动
-				clearInterval(this.ticker);
-			}
-			if (this.funtimeOut) {
-				clearTimeout(this.funtimeOut)
-			}
-			console.log('onUnload')
-		},
-		mounted() {
-			// 获取手机的屏幕高度
-			uni.getSystemInfo({
-				success: (res) => {
-					this.screenHeight = res.screenHeight
-				}
-			})
-		},
-		onPageScroll(e) {
-			this.returnTopFlag = e.scrollTop > 600;
-			this.topLeft = e.scrollTop
-		},
-		methods: {
-			onDetailScroll(e) {
-				console.log(e)
-				this.topLeft = e.scrollTop
-				console.log(this.topLeft)
-			},
-			previewImg(index, cindex) {
-				let img = this.commentList[index].images[cindex]
-				wx.previewImage({
-					current: img, // 当前显示图片的http链接
-					urls: [img] // 需要预览的图片http链接列表
-				})
-			},
-			previewAddImg(index, cindex) {
-				let img = this.commentList[index].images[cindex]
-				wx.previewImage({
-					current: img, // 当前显示图片的http链接
-					urls: [img] // 需要预览的图片http链接列表 previewAddImg
-				})
-			},
-
-			//收藏
-			collectProduct() {
-				if (this.productData.ifCollect === 0) {
-					this.collectPro()
-				} else {
-					this.cancelCollectPro()
-				}
-			},
-			//收藏
-			collectPro() {
-				NET.request(API.collect, {
-					productId: parseInt(this.productId)
-				}, 'POST').then(res => {
-					this.productData.ifCollect = 1
-					uni.showToast({
-						title: '收藏成功',
-						icon: "success"
-					})
-				}).catch(res => {
-					uni.showToast({
-						title: '请先登录',
-						icon: "none"
-					})
-				})
-			},
-			//取消收藏
-			cancelCollectPro() {
-				NET.request(API.cancelCollect, {
-					ids: [this.productId]
-				}, 'PUT').then(res => {
-					this.productData.ifCollect = 0
-					uni.showToast({
-						title: '取消收藏成功',
-						icon: "success"
-					})
-				}).catch(res => {
-					uni.showToast({
-						title: '失败',
-						icon: "none"
-					})
-				})
-			},
-			//去拼单
-			getGroupShow(collageId) {
-				this.showGroupBuyList = false
-				this.goodsDetailShowFlag = true
-				this.collageId = collageId
-			},
-			//拼团下单
-			getGroupSettlement(type) {
-				//判断是否登录
-				let item = {}
-				if (uni.getStorageSync('storage_key')) {
-					item = uni.getStorageSync('storage_key');
-				}
-				if (JSON.stringify(item) === '{}') {
-					uni.navigateTo({
-						url: '../../pages_category_page2/userModule/login'
-					})
-				} else if (this.selectedSku.stockNumber < 1) {
-					uni.showToast({
-						title: '库存不足',
-						icon: "none"
-					})
-				} else {
-					let data = {}
-					if (type === 1) {
-						data = {
-							number: this.buyNum,
-							productId: this.productId,
-							shopId: this.shopId,
-							skuId: this.selectedSku.skuId,
-							shopGroupWorkId: this.selectedSku.shopGroupWorkId,
-							type: type
-						}
-					} else {
-						data = {
-							collageId: this.collageId,
-							number: this.buyNum,
-							productId: this.productId,
-							shopId: this.shopId,
-							skuId: this.selectedSku.skuId,
-							shopGroupWorkId: this.selectedSku.shopGroupWorkId,
-							type: type
-						}
-					}
-					uni.removeStorageSync("skuItemDTOList")
-					uni.setStorageSync('skuItemList', data)
-					//console.log(uni.getStorageSync("skuItemList"),44444)
-					this.goodsDetailShowFlag = false
-					this.buyNum = 1
-					uni.navigateTo({
-						url: '../orderModule/orderConfirm?type=1',
-					})
-				}
-			},
-			beginTimer() { //这个计时器是每秒减去数组中指定字段的时间
-				var haveCollageOrders = false
-				for (var key in this.productData.map) {
-					let collageOrders = this.productData.map[key].collageOrders
-					if (collageOrders && collageOrders.length > 0) {
-						haveCollageOrders = true
-					}
-				}
-				if (haveCollageOrders) {
-					this.ticker = setInterval(() => {
-						for (var key in this.productData.map) {
-							let collageOrders = this.productData.map[key].collageOrders
-							if (collageOrders && collageOrders.length > 0) {
-								for (let i = 0, len = this.productData.map[key].collageOrders.length; i <
-									len; i++) {
-									const item = this.productData.map[key].collageOrders[i]
-									if (item.time > 0) {
-										item.time = item.time - 1000;
-									}
-								}
-							}
-						}
-					}, 1000);
-				}
-			},
-			timeChange(remainMillSecs) {
-				var $that = this;
-				if (remainMillSecs < 0) {
-					// clearInterval(setInterval(this.timeChange(countDown), 1000)); //当无剩余时间了，就停止执行timeChange函数
-				}
-				//求天时分秒 remainMillSecs是毫秒
-				let remainSecs = remainMillSecs / 1000
-				let leftSecond = $that.fillNumber(remainSecs % 60)
-				let leftMinute = $that.fillNumber((remainSecs / 60) % 60)
-				let leftHours = $that.fillNumber((remainSecs / (60 * 60)) % 24)
-				let leftDay = $that.fillNumber(remainSecs / (60 * 60) / 24)
-				if (leftHours === "00" && leftMinute === "00" && leftSecond === "-1") {
-					if (this.ticker) {
-						clearInterval(this.ticker)
-					}
-					this.queryProductDetail()
-				}
-				return leftHours + ":" + leftMinute + ":" + leftSecond;
-			},
-			fillNumber(num) {
-				let number = Math.floor(num); //向下取整
-				return number > 9 ? number : "0" + number;
-			},
-			getfuntime(micro_second) {
-				// 总秒数
-				let second = Math.floor(micro_second / 1000);
-				// 天数
-				let day = Math.floor(second / 3600 / 24);
-				// 小时
-				let hr = Math.floor(second / 3600 % 24);
-				// 分钟
-				let min = Math.floor(second / 60 % 60);
-				// 秒
-				let sec = Math.floor(second % 60);
-				let outtime = ""
-				outtime = hr + ':' + min + ':' + sec
-				return outtime
-			},
-			//时分秒换算
-			dateformat(endTime) {
-				endTime = endTime.substring(0, 19);
-				endTime = endTime.replace(/-/g, '/');
-
-				const micro_second = new Date(endTime).getTime() - new Date().getTime();
-
-				// 总秒数
-				let second = Math.floor(micro_second / 1000);
-				// 天数
-				let day = Math.floor(second / 3600 / 24);
-				// 小时
-				let hr = Math.floor(second / 3600 % 24);
-				// 分钟
-				let min = Math.floor(second / 60 % 60);
-				// 秒
-				let sec = Math.floor(second % 60);
-				this.hou = hr + day * 24
-				this.min = min
-				this.sec = sec
-			},
-			countDown() {
-				if (this.countdownInterval) {
-					return
-				}
-				let _that = this
-				this.countdownInterval = setInterval(() => {
-					let hou = parseInt(this.hou)
-					let min = parseInt(this.min)
-					let sec = parseInt(this.sec)
-
-					let netxSec = sec - 1
-					let netxMin = min
-					let netxHou = hou
-					if (netxHou === 0 && netxMin === 0 && netxSec === -1) {
-						clearInterval(_that.countdownInterval)
-						/* uni.switchTab({
+import UButton from "../../uview-ui/components/u-button/u-button";
+import CombinedSales from "@/components/activities/combinedSales";
+import CouponPopup from "../../components/goodsDetalils/coupon-popup";
+
+const NET = require('../../utils/request')
+const API = require('../../config/api')
+export default {
+  components: {
+    CouponPopup,
+    CombinedSales,
+    UButton,
+  },
+  data() {
+    return {
+      screenHeight: 0,
+      isIphone: "",
+      returnTopFlag: false,
+      goodsDetailShowFlag: false,
+      colorActiveId: 1,
+      modelNumActiveId: 1,
+      parameterShowFlag: false,
+      couponShowFlag: false,
+      couponActiveFlag: 1,
+      succeedShowFlag: false,
+      productId: '',
+      shopGroupWorkId: null,
+      paramSkuId: '',
+      productData: {
+        logisticsPrice: 0
+      },
+      productCommentTotal: 0,
+      commentKeywordVOList: [],
+      buyNum: 1,
+      storeDTO: {}, //店铺信息
+      storeId: '',
+      id: '',
+      storeName: '',
+      selectedSku: {
+        originalPrice: 0
+      },
+      commentList: [],
+      commentListLength: 0,
+      sellDescList: '',
+      couponListLength: 0,
+
+      promotionType: 1,
+      commentImgList: [],
+      showVOList: [],
+      promotionIds: '',
+      couponList: [],
+      isShowSuccess: false,
+      selectedAttr: {},
+      showGroupBuyList: false,
+      topThreeCollageOrders: {}, //拼单数据
+      getProblemsList: [], //商品问答数据
+      problemsPage: 1,
+      problemsPageSize: 2,
+      timeActivetype: true,
+      hou: "00",
+      min: "00",
+      sec: "00",
+      countdownInterval: undefined,
+      funtimeOut: undefined,
+      collageId: 0,
+      problemsListLength: 0,
+      ticker: null,
+      ifWork: 0, //是否拼团商品单独购买
+      shopDiscountId: 0,
+      shopSeckillId: 0,
+      btnType: 1,
+      fenqiIndex: -1,
+      disableFenqiList: [false, false, false],
+      fenqiMoneyList: ["0.00", "0.00", "0.00"],
+      supportHuabei: false,
+      salesId: 0, //分销员id
+      activeTab: 1,
+      // 组合支付
+      swiperOption: {
+        slidesPerView: 3, // 显示数量
+        spaceBetween: 0, // 间隔
+        autoplay: false, // 可选选项，自动滑动
+        loop: true,
+        pagination: {
+          el: '.group-pagination'
+        },
+        navigation: {
+          nextEl: '.swiper-button-next',
+          prevEl: '.swiper-button-prev'
+        }
+      },
+      allCartNum: 0,
+      currentSuk: [],
+      isLoading: false,
+      hasService: false,
+      corpId: null, // 企业ID
+      serviceURL: null, // 客服链接
+      ifSkuSelect: false,
+      markTools: [], //平台优惠券
+      shopMarkTools: [], //店铺优惠券
+      ifShow: false,
+      topLeft: 0,
+      currentActive: 0
+    }
+  },
+  computed: {
+    getcarNum() {
+      this.allCartNum = uni.getStorageSync('allCartNum')
+    }
+  },
+  created() {
+    if (this.countdownInterval) {
+      clearInterval(this.countdownInterval)
+    }
+    if (this.ticker) { //这一段是防止进入页面出去后再进来计时器重复启动
+      clearInterval(this.ticker);
+    }
+    if (this.funtimeOut) {
+      clearTimeout(this.funtimeOut)
+    }
+    if (this.allCartNum > 99) {
+      this.allCartNum = '...'
+    }
+  },
+  onLoad(options) {
+    console.log("options----", options)
+    this.isIphone = getApp().globalData.isIphone;
+    if (getApp().globalData.productShareItem) {
+      const item = getApp().globalData.productShareItem
+      this.shopId = parseInt(item.shopId)
+      this.productId = item.productId
+      this.paramSkuId = item.skuId
+      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
+      this.salesId = parseInt(options.salesId)
+    }
+    // 判断是否是拼团
+    if (options.shopGroupWorkId) {
+      this.shopGroupWorkId = options.shopGroupWorkId
+    }
+    this.queryProductDetail()
+    this.bindSalesCustomer(this.salesId, this.shopId)
+    this.getProblems()
+    this.allCartNum = uni.getStorageSync('allCartNum')
+    this.getServiceUrl()
+  },
+  onUnload() {
+    if (this.countdownInterval) {
+      clearInterval(this.countdownInterval)
+    }
+    if (this.ticker) { //这一段是防止进入页面出去后再进来计时器重复启动
+      clearInterval(this.ticker);
+    }
+    if (this.funtimeOut) {
+      clearTimeout(this.funtimeOut)
+    }
+    console.log('onUnload')
+  },
+  mounted() {
+    // 获取手机的屏幕高度
+    uni.getSystemInfo({
+      success: (res) => {
+        this.screenHeight = res.screenHeight
+      }
+    })
+  },
+  onPageScroll(e) {
+    this.returnTopFlag = e.scrollTop > 600;
+    this.topLeft = e.scrollTop
+  },
+  methods: {
+    onDetailScroll(e) {
+      console.log(e)
+      this.topLeft = e.scrollTop
+      console.log(this.topLeft)
+    },
+    previewImg(index, cindex) {
+      let img = this.commentList[index].images[cindex]
+      wx.previewImage({
+        current: img, // 当前显示图片的http链接
+        urls: [img] // 需要预览的图片http链接列表
+      })
+    },
+    previewAddImg(index, cindex) {
+      let img = this.commentList[index].images[cindex]
+      wx.previewImage({
+        current: img, // 当前显示图片的http链接
+        urls: [img] // 需要预览的图片http链接列表 previewAddImg
+      })
+    },
+
+    //收藏
+    collectProduct() {
+      if (this.productData.ifCollect === 0) {
+        this.collectPro()
+      } else {
+        this.cancelCollectPro()
+      }
+    },
+    //收藏
+    collectPro() {
+      NET.request(API.collect, {
+        productId: parseInt(this.productId)
+      }, 'POST').then(res => {
+        this.productData.ifCollect = 1
+        uni.showToast({
+          title: '收藏成功',
+          icon: "success"
+        })
+      }).catch(res => {
+        uni.showToast({
+          title: '请先登录',
+          icon: "none"
+        })
+      })
+    },
+    //取消收藏
+    cancelCollectPro() {
+      NET.request(API.cancelCollect, {
+        ids: [this.productId]
+      }, 'PUT').then(res => {
+        this.productData.ifCollect = 0
+        uni.showToast({
+          title: '取消收藏成功',
+          icon: "success"
+        })
+      }).catch(res => {
+        uni.showToast({
+          title: '失败',
+          icon: "none"
+        })
+      })
+    },
+    //去拼单
+    getGroupShow(collageId) {
+      this.showGroupBuyList = false
+      this.goodsDetailShowFlag = true
+      this.collageId = collageId
+    },
+    //拼团下单
+    getGroupSettlement(type) {
+      //判断是否登录
+      let item = {}
+      if (uni.getStorageSync('storage_key')) {
+        item = uni.getStorageSync('storage_key');
+      }
+      if (JSON.stringify(item) === '{}') {
+        uni.navigateTo({
+          url: '../../pages_category_page2/userModule/login'
+        })
+      } else if (this.selectedSku.stockNumber < 1) {
+        uni.showToast({
+          title: '库存不足',
+          icon: "none"
+        })
+      } else {
+        let data = {}
+        if (type === 1) {
+          data = {
+            number: this.buyNum,
+            productId: this.productId,
+            shopId: this.shopId,
+            skuId: this.selectedSku.skuId,
+            shopGroupWorkId: this.selectedSku.shopGroupWorkId,
+            type: type
+          }
+        } else {
+          data = {
+            collageId: this.collageId,
+            number: this.buyNum,
+            productId: this.productId,
+            shopId: this.shopId,
+            skuId: this.selectedSku.skuId,
+            shopGroupWorkId: this.selectedSku.shopGroupWorkId,
+            type: type
+          }
+        }
+        uni.removeStorageSync("skuItemDTOList")
+        uni.setStorageSync('skuItemList', data)
+        //console.log(uni.getStorageSync("skuItemList"),44444)
+        this.goodsDetailShowFlag = false
+        this.buyNum = 1
+        uni.navigateTo({
+          url: '../orderModule/orderConfirm?type=1',
+        })
+      }
+    },
+    beginTimer() { //这个计时器是每秒减去数组中指定字段的时间
+      var haveCollageOrders = false
+      for (var key in this.productData.map) {
+        let collageOrders = this.productData.map[key].collageOrders
+        if (collageOrders && collageOrders.length > 0) {
+          haveCollageOrders = true
+        }
+      }
+      if (haveCollageOrders) {
+        this.ticker = setInterval(() => {
+          for (var key in this.productData.map) {
+            let collageOrders = this.productData.map[key].collageOrders
+            if (collageOrders && collageOrders.length > 0) {
+              for (let i = 0, len = this.productData.map[key].collageOrders.length; i <
+              len; i++) {
+                const item = this.productData.map[key].collageOrders[i]
+                if (item.time > 0) {
+                  item.time = item.time - 1000;
+                }
+              }
+            }
+          }
+        }, 1000);
+      }
+    },
+    timeChange(remainMillSecs) {
+      var $that = this;
+      if (remainMillSecs < 0) {
+        // clearInterval(setInterval(this.timeChange(countDown), 1000)); //当无剩余时间了，就停止执行timeChange函数
+      }
+      //求天时分秒 remainMillSecs是毫秒
+      let remainSecs = remainMillSecs / 1000
+      let leftSecond = $that.fillNumber(remainSecs % 60)
+      let leftMinute = $that.fillNumber((remainSecs / 60) % 60)
+      let leftHours = $that.fillNumber((remainSecs / (60 * 60)) % 24)
+      let leftDay = $that.fillNumber(remainSecs / (60 * 60) / 24)
+      if (leftHours === "00" && leftMinute === "00" && leftSecond === "-1") {
+        if (this.ticker) {
+          clearInterval(this.ticker)
+        }
+        this.queryProductDetail()
+      }
+      return leftHours + ":" + leftMinute + ":" + leftSecond;
+    },
+    fillNumber(num) {
+      let number = Math.floor(num); //向下取整
+      return number > 9 ? number : "0" + number;
+    },
+    getfuntime(micro_second) {
+      // 总秒数
+      let second = Math.floor(micro_second / 1000);
+      // 天数
+      let day = Math.floor(second / 3600 / 24);
+      // 小时
+      let hr = Math.floor(second / 3600 % 24);
+      // 分钟
+      let min = Math.floor(second / 60 % 60);
+      // 秒
+      let sec = Math.floor(second % 60);
+      let outtime = ""
+      outtime = hr + ':' + min + ':' + sec
+      return outtime
+    },
+    //时分秒换算
+    dateformat(endTime) {
+      endTime = endTime.substring(0, 19);
+      endTime = endTime.replace(/-/g, '/');
+
+      const micro_second = new Date(endTime).getTime() - new Date().getTime();
+
+      // 总秒数
+      let second = Math.floor(micro_second / 1000);
+      // 天数
+      let day = Math.floor(second / 3600 / 24);
+      // 小时
+      let hr = Math.floor(second / 3600 % 24);
+      // 分钟
+      let min = Math.floor(second / 60 % 60);
+      // 秒
+      let sec = Math.floor(second % 60);
+      this.hou = hr + day * 24
+      this.min = min
+      this.sec = sec
+    },
+    countDown() {
+      if (this.countdownInterval) {
+        return
+      }
+      let _that = this
+      this.countdownInterval = setInterval(() => {
+        let hou = parseInt(this.hou)
+        let min = parseInt(this.min)
+        let sec = parseInt(this.sec)
+
+        let netxSec = sec - 1
+        let netxMin = min
+        let netxHou = hou
+        if (netxHou === 0 && netxMin === 0 && netxSec === -1) {
+          clearInterval(_that.countdownInterval)
+          /* uni.switchTab({
 							url: '../../pages/tabbar/index/index'
 						}) */
-						uni.showToast({
-							title: "活动结束",
-							duration: 2000,
-							icon: 'none'
-						})
-						this.selectedSku.activityType = 0
-						location.reload()
-					} else {
-						if (netxSec === -1) {
-							netxSec = 59
-							netxMin = netxMin - 1;
-						}
-						if (netxMin === -1) {
-							netxMin = 59
-							netxHou = netxHou - 1
-						}
-
-						this.hou = this.timeFormat(netxHou)
-						this.min = this.timeFormat(netxMin)
-						this.sec = this.timeFormat(netxSec)
-					}
-				}, 1000)
-			},
-			timeFormat(param) { //小于10的格式化函数
-				return param < 10 ? '0' + param : param;
-			},
-			goshopCart() {
-				uni.switchTab({
-					url: '../../pages/tabbar/cart/index'
-				})
-			},
-			twonumansers(answers) {
-				return answers.slice(0, 2)
-			},
-			//商品问答数据
-			getProblems() {
-				NET.request(API.getProblems, {
-					productId: this.productId,
-					page: this.problemsPage,
-					pageSize: this.problemsPageSize
-				}, 'GET').then(res => {
-					this.getProblemsList = res.data.list
-					this.problemsListLength = res.data.total
-				}).catch(res => {
-					uni.showToast({
-						title: '失败',
-						icon: "none"
-					})
-				})
-			},
-			moveHandle() {
-				return
-			},
-			changeTabs(type) {
-				this.activeTab = type
-			},
-			//查看所有评论
-			commentAll() {
-				uni.navigateTo({
-					url: 'evaluateList?commentList=' + JSON.stringify(this.commentList)
-				})
-			},
-			commentImgData(imgData) {
-				let imgDataResult = []
-				imgDataResult = imgData.split(",");
-				return imgDataResult
-			},
-			top() { //回到顶部
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 300
-				});
-			},
-			//商品尺寸弹窗
-			goodsDetailShowClick(type) {
-				if (type === 6) {
-					this.ifSkuSelect = true
-				} else {
-					this.ifSkuSelect = false
-				}
-				this.btnType = type
-				this.collageId = 0
-				this.goodsDetailShowFlag = true
-			},
-			//商品参数弹窗
-			parameterTruebut() {
-				this.parameterShowFlag = false
-			},
-			parameterShowClick() {
-				this.parameterShowFlag = true
-			},
-			//优惠券
-			couponActive(type) {
-				this.couponActiveFlag = type
-			},
-			//优惠券弹窗
-			couponShowClick() {
-				this.$refs.couponPopup.showActivity = true
-			},
-			//领取成功
-			succeedShowClick() {
-				this.succeedShowFlag = true
-				if (this.succeedShowFlag === true) {
-					setTimeout(() => {
-						this.succeedShowFlag = false
-						// this.$refs.couponPopup.showActivity = false
-					}, 1500);
-				}
-			},
-			selectBySkuId(skuId) {
-				if (skuId) {
-					let mapinfo = this.productData.map
-					for (var key in mapinfo) {
-						console.log(skuId, mapinfo[key].skuId, 'test')
-						if (parseInt(mapinfo[key].skuId) === parseInt(skuId)) {
-							this.selectedSku = mapinfo[key]
-							// 选中sku对应的规格
-							const valueCodeList = key.split(',')
-							this.productData.names.forEach(attr => {
-								for (var index in attr.values) {
-									let valueCode = attr.values[index].valueCode
-									if (valueCodeList.includes(valueCode)) {
-										this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
-										let obj = {
-											skuText: ''
-										}
-										if (attr.values[index].valueCode === '单款项') {
-											obj.skuText = attr.values[index].skuValue
-											this.currentSuk.push(obj)
-											break
-										} else {
-											obj.skuText =
-												`${attr.values[index].skuName}:${attr.values[index].skuValue}`
-											this.currentSuk.push(obj)
-											break
-										}
-									}
-								}
-							})
-							break
-						}
-					}
-				}
-			},
-			nameCodeValueCodeClick(nameCode, valueCode, reSelectSku) {
-				this.selectedAttr[nameCode] = valueCode
-				if (reSelectSku) {
-					let attrList = []
-					for (var key in this.selectedAttr) {
-						attrList.push(this.selectedAttr[key])
-					}
-					const attrkey = attrList.join(',')
-					let mapinfo = this.productData.map
-					for (var key in mapinfo) {
-						if (attrkey === key) {
-							this.selectedSku = mapinfo[key]
-							const valueCodeList = mapinfo[key].valueCodes.split(',')
-							this.productData.names.forEach(attr => {
-								for (var index in attr.values) {
-									let valueCode = attr.values[index].valueCode
-									if (valueCodeList.includes(valueCode)) {
-										this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
-										let obj = {
-											skuText: ''
-										}
-										if (attr.values[index].valueCode === '单款项') {
-											obj.skuText = attr.values[index].skuValue
-											this.currentSuk.push(obj)
-											break
-										} else {
-											obj.skuText =
-												`${attr.values[index].skuName}:${attr.values[index].skuValue}`
-											this.currentSuk.push(obj)
-											break
-										}
-									}
-								}
-								this.currentSuk.shift()
-							})
-						}
-						// this.productData.names.forEach(attr => {
-						//   for (var index in attr.values) {
-						//     let valueCode = attr.values[index].valueCode
-						//     if (valueCodeList.includes(valueCode)) {
-						//       this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
-						//       this.currentSuk += `${attr.values[index].skuName}:${attr.values[index].skuValue} `
-						//       console.log(this.currentSuk, 'currentSuk')
-						//       break
-						//     }
-						//   }
-						// })
-					}
-				}
-				// 选中sku之后，做一些相应的操作
-				this.selectSkuPostProcessor()
-
-				this.$forceUpdate(); // 重绘
-			},
-			selectSkuPostProcessor() {
-				console.log('selectSkuPostProcessor')
-				const ifEnable = this.selectedSku.ifEnable
-				if (this.selectedSku.activityType === 1 && ifEnable === 0) {
-					this.topThreeCollageOrders = this.selectedSku.collageOrders.slice(0, 3)
-				}
-				if ([1, 2, 3, 4, 5].includes(this.selectedSku.activityType) && ifEnable === 0) {
-					this.dateformat(this.selectedSku.endTime)
-					this.countDown();
-				}
-				this.timeActivetype = ifEnable === 0;
-				this.shopDiscountId = this.selectedSku.shopDiscountId
-				this.shopSeckillId = this.selectedSku.shopSeckillId
-			},
-			//分期选中事件
-			selectFenqi(index) {
-				if (this.fenqiIndex !== index && !this.disableFenqiList[index]) {
-					this.fenqiIndex = index;
-				} else {
-					this.fenqiIndex = -1;
-				}
-			},
-			renderHuabei(skuPrice) {
-				//console.log('renderHuabei: ', skuPrice, this.productData.ifHuabei)
-				if (this.productData.ifHuabei === 1) {
-					if (skuPrice && skuPrice >= 0.03) {
-						this.supportHuabei = true
-						this.disableFenqiList[0] = false;
-						this.fenqiMoneyList[0] = (parseInt(skuPrice / 3 * 100) / 100).toFixed(2) + ""
-					}
-					if (skuPrice && skuPrice >= 0.06) {
-						this.disableFenqiList[1] = false;
-						this.fenqiMoneyList[1] = (parseInt(skuPrice / 6 * 100) / 100).toFixed(2) + ""
-					}
-					if (skuPrice && skuPrice >= 0.12) {
-						this.disableFenqiList[2] = false;
-						this.fenqiMoneyList[2] = (parseInt(skuPrice / 12 * 100) / 100).toFixed(2) + ""
-					}
-				}
-			},
-			//大小尺寸选中事件
-			modelNumActiveClick(type) {
-				this.modelNumActiveId = type
-			},
-			//获取商品详情
-			queryProductDetail() {
-				uni.showLoading({
-					title: '加载中...',
-					mask: true
-				})
-				let postData = {
-					shopId: this.shopId,
-					productId: this.productId,
-					skuId: this.paramSkuId,
-					terminal: 1
-				}
-				NET.request(API.QueryProductDetail, postData,
-					"GET").then(res => {
-					uni.hideLoading()
-					this.productData = res.data
-
-					this.markTools = res.data.markTools //平台优惠券
-					this.shopMarkTools = res.data.shopMarkTools //店铺优惠券
-					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: this.productData.names[0].skuName,
-							valueCode: '单款项'
-						})
-					}
-
-					//如果sku的图像为空，设置为商品的图像
-					for (var key in this.productData.map) {
-						let skuImage = this.productData.map[key].image
-						if (!skuImage) {
-							this.productData.map[key].image = this.productData.images[0]
-						}
-					}
-
-					//评价
-					this.commentList = res.data.comments
-					this.commentListLength = this.commentList.length
-					this.sellDescList = res.data.text.replace(/\<img/gi,
-						'<img style="max-width:100%;height:auto" ')
-					this.couponListLength = res.data.couponImages.length
-					this.showVOList = res.data.couponImages
-					this.couponList = res.data.markTools
-					const ids = this.couponList.map(item => {
-						return item.couponId
-					})
-					//渲染商详之后，如果参数传了skuId，则选中该skuId，否则选中第一个规格
-					if (this.paramSkuId) {
-						this.selectBySkuId(this.paramSkuId)
-					} else {
-						for (var attr in this.productData.names) {
-							this.nameCodeValueCodeClick(attr.nameCode, attr.values[0].valueCode, true)
-						}
-					}
-
-					this.beginTimer();
-					this.ifShow = true
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			// 查看全部问答
-			seeAllFn(problemId) {
-				let data = {
-					productId: this.productId,
-					img: this.productData.images[0],
-					productName: this.productData.productName,
-					questionlength: this.problemsListLength,
-					problemId: problemId
-				}
-				uni.setStorageSync("seeAllFnData", data)
-				uni.navigateTo({
-					url: 'qADetail'
-				})
-			},
-			// 查看当前全部回答
-			seeAllQa() {
-				uni.navigateTo({
-					url: 'answerList?productId=' + this.productId + "&img=" + this.productData.images[0] +
-						'&productName=' + this.productData.productName
-				})
-			},
-			// 提问
-			goToQuestions() {
-				let data = {
-					productId: this.productId,
-					images: this.productData.images[0],
-					productName: this.productData.productName,
-					questionNumber: this.getProblemsList.length
-				}
-				uni.navigateTo({
-					url: 'putQuestions?data=' + JSON.stringify(data)
-				})
-			},
-			// 数量减
-			numSub() {
-				if (this.buyNum > 1) {
-					this.buyNum = this.buyNum - 1
-				} else {
-					uni.showToast({
-						title: '亲！至少一件哦！',
-						icon: "none"
-					})
-				}
-			},
-			// 数量加
-			numAdd() {
-				if (this.buyNum < this.selectedSku.stockNumber) {
-					this.buyNum = this.buyNum + 1
-				} else {
-					uni.showToast({
-						title: '库存不足！',
-						icon: "none"
-					})
-				}
-			},
-			//加入购物车
-			addCart() {
-				//判断是否登录
-				let item = {}
-				if (uni.getStorageSync('storage_key')) {
-					item = uni.getStorageSync('storage_key');
-				}
-				if (JSON.stringify(item) === '{}') {
-					uni.navigateTo({
-						url: '../../pages_category_page2/userModule/login'
-					})
-				} else {
-					if (this.selectedSku.stockNumber < 1) {
-						uni.showToast({
-							title: '库存不足',
-							icon: "none"
-						})
-					} else {
-						uni.showLoading({
-							mask: true,
-							title: '添加中...',
-						})
-						NET.request(API.ShoppingaddCart, {
-							skuId: this.selectedSku.skuId,
-							number: this.buyNum,
-						}, 'POST').then(res => {
-							// 给购物车小图标赋值数量
-							let newallCartNum = uni.getStorageSync('allCartNum') + this.buyNum
-							uni.setStorageSync('allCartNum', newallCartNum)
-							this.allCartNum = uni.getStorageSync('allCartNum')
-
-							uni.hideLoading()
-							uni.showToast({
-								title: '添加成功',
-								icon: 'none'
-							})
-							setTimeout(() => {
-								this.goodsDetailShowFlag = false
-							}, 1500);
-							this.buyNum = 1
-						}).catch(res => {
-							uni.hideLoading()
-							if (res.data.code === 40005) {
-								uni.navigateTo({
-									url: '../../pages_category_page2/userModule/login'
-								})
-							}
-						})
-					}
-				}
-			},
-			//逛店铺
-			goStore() {
-				uni.navigateTo({
-					url: '../store/index?storeId=' + this.shopId
-				})
-			},
-			//点赞
-			zanTap(index, likeId, actionType) {
-				uni.showLoading({
-					mask: true,
-					title: '提交中...',
-				})
-				NET.request(API.LikeOrUnLikeComment, {
-					commentId: likeId,
-					ifLike: actionType
-				}, 'POST').then(res => {
-					uni.hideLoading()
-					// this.commentVOList[index].ifLike = !this.commentVOList[index].ifLike
-					// this.commentVOList[index].likes = this.commentVOList[index].ifLike ? this.commentVOList[index].likes + 1 :
-					//     this.commentVOList[index].likes - 1
-					if (this.commentList[index].ifLike === 1) {
-						this.commentList[index].ifLike = 0
-						this.commentList[index].likes = this.commentList[index].likes - 1
-					} else {
-						uni.showToast({
-							title: "点赞成功",
-							icon: 'none'
-						})
-						this.commentList[index].likes = this.commentList[index].likes + 1
-						//console.log(this.commentList[index].likes, 'num')
-						this.commentList[index].ifLike = 1
-					}
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			// 点击分享
-			clickShare() {
-				// #ifdef APP-PLUS
-				var system = 1
-				// #endif
-
-				// #ifdef H5
-				var system = 3
-				// #endif
-
-				// #ifdef MP-WEIXIN
-				var system = 2
-				// #endif
-
-				// #ifdef MP-ALIPAY
-				var system = 4
-				// #endif
-				uni.showLoading({
-					mask: true,
-					title: '请稍候...'
-				})
-				NET.request(API.getSharePic, {
-					productId: this.productData.productId,
-					shopId: this.productData.shopId,
-					skuId: this.paramSkuId,
-					terminal: system
-				}, 'GET').then(res => {
-					uni.hideLoading()
-					// 推广商品
-					uni.navigateTo({
-						url: `../../pages_category_page1/distributionModule/shareProduct?shareImg=${res.data}&shopId=${this.productData.shopId}&productId=${this.productData.productId}&skuId=${this.paramSkuId}`
-					});
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			//立即购买
-			addFast(type) {
-				//判断是否登录
-				let item = {}
-				if (uni.getStorageSync('storage_key')) {
-					item = uni.getStorageSync('storage_key');
-				}
-				if (JSON.stringify(item) === '{}') {
-					uni.navigateTo({
-						url: '../../pages_category_page2/userModule/login'
-					})
-				} else {
-					if (type === 1) {
-						this.ifWork = 1
-					} else {
-						this.ifWork = 0
-					}
-					if (this.selectedSku.stockNumber < 1) {
-						uni.showToast({
-							title: '库存不足',
-							icon: "none"
-						})
-					} else if (this.buyNum > this.selectedSku.stockNumber && this.selectedSku.stockNumber !== 0) {
-						uni.showToast({
-							title: '已超出最大数量限制',
-							icon: "none"
-						})
-					} else {
-						let list = [{
-							ifWork: this.ifWork,
-							shopId: '',
-							shopName: '',
-							shopDiscountId: null,
-							shopSeckillId: null,
-							skus: [ //商品明细
-								{
-									productId: 0,
-									skuId: 0,
-									productName: "",
-									image: "",
-									price: 0,
-									weight: 0,
-									number: 0,
-									SKU: "",
-									total: 0,
-									ifLogistics: 1
-								}
-							]
-						}]
-						list[0].shopId = this.productData.shopId
-						list[0].shopName = this.productData.shopName
-						list[0].skus[0].productId = this.productData.productId
-						list[0].skus[0].skuId = this.selectedSku.skuId
-						list[0].skus[0].productName = this.productData.productName
-						list[0].skus[0].image = this.selectedSku.image
-						list[0].skus[0].number = this.buyNum
-						if (type === 1) {
-							list[0].skus[0].price = this.selectedSku.originalPrice
-							list[0].skus[0].total = this.selectedSku.originalPrice * this.buyNum
-						} else {
-							list[0].skus[0].price = this.selectedSku.price
-							list[0].skus[0].total = this.selectedSku.price * this.buyNum
-						}
-
-						//list[0].skus[0].ifLogistics = this.skuProdList.ifLogistics
-						if (this.shopSeckillId > 0) {
-							list[0].shopSeckillId = this.shopSeckillId
-						}
-						//console.log(this.shopDiscountId,555)
-						if (this.shopDiscountId > 0) {
-							list[0].shopDiscountId = this.shopDiscountId
-						}
-						uni.setStorageSync('skuItemDTOList', list)
-						this.goodsDetailShowFlag = false
-						uni.navigateTo({
-							url: '../orderModule/orderConfirm?type=1',
-						})
-						this.buyNum = 1
-					}
-				}
-			},
-			bindSalesCustomer(salesId, storeId) {
-				if (salesId && storeId) {
-					//如果已登录，静默绑定客户关系，否则跳转到登录页面
-					if (uni.getStorageSync('storage_key')) {
-						NET.request(API.BindSalesCustomer, {
-							shopId: storeId,
-							distributorId: salesId
-						}, 'POST').then(res => {
-							uni.showToast({
-								title: "绑定成功",
-								icon: "none"
-							})
-						}).catch(res => {
-							uni.showToast({
-								title: res.data.msg,
-								icon: "none"
-							})
-						})
-					} else {
-						uni.setStorageSync('salesId', salesId)
-						uni.setStorageSync("shopId", storeId)
-						uni.navigateTo({
-							url: '../../pages_category_page2/userModule/login'
-						})
-					}
-				}
-			},
-			openAllBuy() {
-				this.showGroupBuyList = true
-			},
-			openAllBuyTwo() {
-				uni.showToast({
-					title: "还没有人拼单，快去拼单吧！",
-					icon: "none"
-				})
-			},
-			getServiceUrl() {
-				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') || []
-
-				const index = shopids.indexOf(this.shopId)
-				if (index === -1) {
-					this.isLoading = true
-					const id = this.shopId || null
-					NET.request(API.CustomerService, {
-						id
-					}, 'get').then(res => {
-						if (res.code === '' && res.data.corpId && res.data.url) {
-							shopids.push(this.shopId)
-							corpIds.push(res.data.corpId)
-							urls.push(res.data.url)
-
-							uni.setStorageSync('service_shopids', shopids);
-							uni.setStorageSync('service_corpIds', corpIds);
-							uni.setStorageSync('service_urls', urls);
-
-							this.corpId = res.data.corpId
-							this.serviceURL = res.data.url
-							if (this.serviceURL) {
-								this.hasService = true
-							}
-						}
-						this.isLoading = false
-					}).catch(err => {
-						console.log(err)
-						this.isLoading = false
-					})
-				} else {
-					this.corpId = corpIds[index]
-					this.serviceURL = urls[index]
-					if (this.serviceURL) {
-						this.hasService = true
-					}
-				}
-			},
-			flyToService() {
-				let self = this
-				console.log(self.serviceURL, self.corpId)
-				if (!self.serviceURL || !self.corpId) {
-					self.hasService = false
-					return
-				}
-				wx.openCustomerServiceChat({
-					extInfo: {
-						url: self.serviceURL
-					},
-					corpId: self.corpId, // 企业ID
-					success(res) {},
-					fail(err) {}
-				})
-			},
-		}
-	}
+          uni.showToast({
+            title: "活动结束",
+            duration: 2000,
+            icon: 'none'
+          })
+          this.selectedSku.activityType = 0
+          location.reload()
+        } else {
+          if (netxSec === -1) {
+            netxSec = 59
+            netxMin = netxMin - 1;
+          }
+          if (netxMin === -1) {
+            netxMin = 59
+            netxHou = netxHou - 1
+          }
+
+          this.hou = this.timeFormat(netxHou)
+          this.min = this.timeFormat(netxMin)
+          this.sec = this.timeFormat(netxSec)
+        }
+      }, 1000)
+    },
+    timeFormat(param) { //小于10的格式化函数
+      return param < 10 ? '0' + param : param;
+    },
+    goshopCart() {
+      uni.switchTab({
+        url: '../../pages/tabbar/cart/index'
+      })
+    },
+    twonumansers(answers) {
+      return answers.slice(0, 2)
+    },
+    //商品问答数据
+    getProblems() {
+      NET.request(API.getProblems, {
+        productId: this.productId,
+        page: this.problemsPage,
+        pageSize: this.problemsPageSize
+      }, 'GET').then(res => {
+        this.getProblemsList = res.data.list
+        this.problemsListLength = res.data.total
+      }).catch(res => {
+        uni.showToast({
+          title: '失败',
+          icon: "none"
+        })
+      })
+    },
+    moveHandle() {
+      return
+    },
+    changeTabs(type) {
+      this.activeTab = type
+    },
+    //查看所有评论
+    commentAll() {
+      uni.navigateTo({
+        url: 'evaluateList?commentList=' + JSON.stringify(this.commentList)
+      })
+    },
+    commentImgData(imgData) {
+      let imgDataResult = []
+      imgDataResult = imgData.split(",");
+      return imgDataResult
+    },
+    top() { //回到顶部
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 300
+      });
+    },
+    //商品尺寸弹窗
+    goodsDetailShowClick(type) {
+      if (type === 6) {
+        this.ifSkuSelect = true
+      } else {
+        this.ifSkuSelect = false
+      }
+      this.btnType = type
+      this.collageId = 0
+      this.goodsDetailShowFlag = true
+    },
+    //商品参数弹窗
+    parameterTruebut() {
+      this.parameterShowFlag = false
+    },
+    parameterShowClick() {
+      this.parameterShowFlag = true
+    },
+    //优惠券
+    couponActive(type) {
+      this.couponActiveFlag = type
+    },
+    //优惠券弹窗
+    couponShowClick() {
+      this.$refs.couponPopup.showActivity = true
+    },
+    //领取成功
+    succeedShowClick() {
+      this.succeedShowFlag = true
+      if (this.succeedShowFlag === true) {
+        setTimeout(() => {
+          this.succeedShowFlag = false
+          // this.$refs.couponPopup.showActivity = false
+        }, 1500);
+      }
+    },
+    selectBySkuId(skuId) {
+      if (skuId) {
+        let mapinfo = this.productData.map
+        for (var key in mapinfo) {
+          console.log(skuId, mapinfo[key].skuId, 'test')
+          if (parseInt(mapinfo[key].skuId) === parseInt(skuId)) {
+            this.selectedSku = mapinfo[key]
+            // 选中sku对应的规格
+            const valueCodeList = key.split(',')
+            this.productData.names.forEach(attr => {
+              for (var index in attr.values) {
+                let valueCode = attr.values[index].valueCode
+                if (valueCodeList.includes(valueCode)) {
+                  this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
+                  let obj = {
+                    skuText: ''
+                  }
+                  if (attr.values[index].valueCode === '单款项') {
+                    obj.skuText = attr.values[index].skuValue
+                    this.currentSuk.push(obj)
+                    break
+                  } else {
+                    obj.skuText =
+                        `${attr.values[index].skuName}:${attr.values[index].skuValue}`
+                    this.currentSuk.push(obj)
+                    break
+                  }
+                }
+              }
+            })
+            break
+          }
+        }
+      }
+    },
+    nameCodeValueCodeClick(nameCode, valueCode, reSelectSku) {
+      this.selectedAttr[nameCode] = valueCode
+      if (reSelectSku) {
+        let attrList = []
+        for (var key in this.selectedAttr) {
+          attrList.push(this.selectedAttr[key])
+        }
+        const attrkey = attrList.join(',')
+        let mapinfo = this.productData.map
+        for (var key in mapinfo) {
+          if (attrkey === key) {
+            this.selectedSku = mapinfo[key]
+            const valueCodeList = mapinfo[key].valueCodes.split(',')
+            this.productData.names.forEach(attr => {
+              for (var index in attr.values) {
+                let valueCode = attr.values[index].valueCode
+                if (valueCodeList.includes(valueCode)) {
+                  this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
+                  let obj = {
+                    skuText: ''
+                  }
+                  if (attr.values[index].valueCode === '单款项') {
+                    obj.skuText = attr.values[index].skuValue
+                    this.currentSuk.push(obj)
+                    break
+                  } else {
+                    obj.skuText =
+                        `${attr.values[index].skuName}:${attr.values[index].skuValue}`
+                    this.currentSuk.push(obj)
+                    break
+                  }
+                }
+              }
+              this.currentSuk.shift()
+            })
+          }
+          // this.productData.names.forEach(attr => {
+          //   for (var index in attr.values) {
+          //     let valueCode = attr.values[index].valueCode
+          //     if (valueCodeList.includes(valueCode)) {
+          //       this.nameCodeValueCodeClick(attr.nameCode, valueCode, false)
+          //       this.currentSuk += `${attr.values[index].skuName}:${attr.values[index].skuValue} `
+          //       console.log(this.currentSuk, 'currentSuk')
+          //       break
+          //     }
+          //   }
+          // })
+        }
+      }
+      // 选中sku之后，做一些相应的操作
+      this.selectSkuPostProcessor()
+
+      this.$forceUpdate(); // 重绘
+    },
+    selectSkuPostProcessor() {
+      console.log('selectSkuPostProcessor')
+      const ifEnable = this.selectedSku.ifEnable
+      if (this.selectedSku.activityType === 1 && ifEnable === 0) {
+        this.topThreeCollageOrders = this.selectedSku.collageOrders.slice(0, 3)
+      }
+      if ([1, 2, 3, 4, 5].includes(this.selectedSku.activityType) && ifEnable === 0) {
+        this.dateformat(this.selectedSku.endTime)
+        this.countDown();
+      }
+      this.timeActivetype = ifEnable === 0;
+      this.shopDiscountId = this.selectedSku.shopDiscountId
+      this.shopSeckillId = this.selectedSku.shopSeckillId
+    },
+    //分期选中事件
+    selectFenqi(index) {
+      if (this.fenqiIndex !== index && !this.disableFenqiList[index]) {
+        this.fenqiIndex = index;
+      } else {
+        this.fenqiIndex = -1;
+      }
+    },
+    renderHuabei(skuPrice) {
+      //console.log('renderHuabei: ', skuPrice, this.productData.ifHuabei)
+      if (this.productData.ifHuabei === 1) {
+        if (skuPrice && skuPrice >= 0.03) {
+          this.supportHuabei = true
+          this.disableFenqiList[0] = false;
+          this.fenqiMoneyList[0] = (parseInt(skuPrice / 3 * 100) / 100).toFixed(2) + ""
+        }
+        if (skuPrice && skuPrice >= 0.06) {
+          this.disableFenqiList[1] = false;
+          this.fenqiMoneyList[1] = (parseInt(skuPrice / 6 * 100) / 100).toFixed(2) + ""
+        }
+        if (skuPrice && skuPrice >= 0.12) {
+          this.disableFenqiList[2] = false;
+          this.fenqiMoneyList[2] = (parseInt(skuPrice / 12 * 100) / 100).toFixed(2) + ""
+        }
+      }
+    },
+    //大小尺寸选中事件
+    modelNumActiveClick(type) {
+      this.modelNumActiveId = type
+    },
+    //获取商品详情
+    queryProductDetail() {
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
+      let postData = {
+        shopId: this.shopId,
+        productId: this.productId,
+        skuId: this.paramSkuId,
+        terminal: 1
+      }
+      NET.request(API.QueryProductDetail, postData,
+          "GET").then(res => {
+        uni.hideLoading()
+        this.productData = res.data
+
+        this.markTools = res.data.markTools //平台优惠券
+        this.shopMarkTools = res.data.shopMarkTools //店铺优惠券
+        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: this.productData.names[0].skuName,
+            valueCode: '单款项'
+          })
+        }
+
+        //如果sku的图像为空，设置为商品的图像
+        for (var key in this.productData.map) {
+          let skuImage = this.productData.map[key].image
+          if (!skuImage) {
+            this.productData.map[key].image = this.productData.images[0]
+          }
+        }
+
+        //评价
+        this.commentList = res.data.comments
+        this.commentListLength = this.commentList.length
+        this.sellDescList = res.data.text.replace(/\<img/gi,
+            '<img style="max-width:100%;height:auto" ')
+        this.couponListLength = res.data.couponImages.length
+        this.showVOList = res.data.couponImages
+        this.couponList = res.data.markTools
+        const ids = this.couponList.map(item => {
+          return item.couponId
+        })
+        //渲染商详之后，如果参数传了skuId，则选中该skuId，否则选中第一个规格
+        if (this.paramSkuId) {
+          this.selectBySkuId(this.paramSkuId)
+        } else {
+          for (var attr in this.productData.names) {
+            this.nameCodeValueCodeClick(attr.nameCode, attr.values[0].valueCode, true)
+          }
+        }
+
+        this.beginTimer();
+        this.ifShow = true
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    // 查看全部问答
+    seeAllFn(problemId) {
+      let data = {
+        productId: this.productId,
+        img: this.productData.images[0],
+        productName: this.productData.productName,
+        questionlength: this.problemsListLength,
+        problemId: problemId
+      }
+      uni.setStorageSync("seeAllFnData", data)
+      uni.navigateTo({
+        url: 'qADetail'
+      })
+    },
+    // 查看当前全部回答
+    seeAllQa() {
+      uni.navigateTo({
+        url: 'answerList?productId=' + this.productId + "&img=" + this.productData.images[0] +
+            '&productName=' + this.productData.productName
+      })
+    },
+    // 提问
+    goToQuestions() {
+      let data = {
+        productId: this.productId,
+        images: this.productData.images[0],
+        productName: this.productData.productName,
+        questionNumber: this.getProblemsList.length
+      }
+      uni.navigateTo({
+        url: 'putQuestions?data=' + JSON.stringify(data)
+      })
+    },
+    // 数量减
+    numSub() {
+      if (this.buyNum > 1) {
+        this.buyNum = this.buyNum - 1
+      } else {
+        uni.showToast({
+          title: '亲！至少一件哦！',
+          icon: "none"
+        })
+      }
+    },
+    // 数量加
+    numAdd() {
+      if (this.buyNum < this.selectedSku.stockNumber) {
+        this.buyNum = this.buyNum + 1
+      } else {
+        uni.showToast({
+          title: '库存不足！',
+          icon: "none"
+        })
+      }
+    },
+    //加入购物车
+    addCart() {
+      //判断是否登录
+      let item = {}
+      if (uni.getStorageSync('storage_key')) {
+        item = uni.getStorageSync('storage_key');
+      }
+      if (JSON.stringify(item) === '{}') {
+        uni.navigateTo({
+          url: '../../pages_category_page2/userModule/login'
+        })
+      } else {
+        if (this.selectedSku.stockNumber < 1) {
+          uni.showToast({
+            title: '库存不足',
+            icon: "none"
+          })
+        } else {
+          uni.showLoading({
+            mask: true,
+            title: '添加中...',
+          })
+          NET.request(API.ShoppingaddCart, {
+            skuId: this.selectedSku.skuId,
+            number: this.buyNum,
+          }, 'POST').then(res => {
+            // 给购物车小图标赋值数量
+            let newallCartNum = uni.getStorageSync('allCartNum') + this.buyNum
+            uni.setStorageSync('allCartNum', newallCartNum)
+            this.allCartNum = uni.getStorageSync('allCartNum')
+
+            uni.hideLoading()
+            uni.showToast({
+              title: '添加成功',
+              icon: 'none'
+            })
+            setTimeout(() => {
+              this.goodsDetailShowFlag = false
+            }, 1500);
+            this.buyNum = 1
+          }).catch(res => {
+            uni.hideLoading()
+            if (res.data.code === 40005) {
+              uni.navigateTo({
+                url: '../../pages_category_page2/userModule/login'
+              })
+            }
+          })
+        }
+      }
+    },
+    //逛店铺
+    goStore() {
+      uni.navigateTo({
+        url: '../store/index?storeId=' + this.shopId
+      })
+    },
+    //点赞
+    zanTap(index, likeId, actionType) {
+      uni.showLoading({
+        mask: true,
+        title: '提交中...',
+      })
+      NET.request(API.LikeOrUnLikeComment, {
+        commentId: likeId,
+        ifLike: actionType
+      }, 'POST').then(res => {
+        uni.hideLoading()
+        // this.commentVOList[index].ifLike = !this.commentVOList[index].ifLike
+        // this.commentVOList[index].likes = this.commentVOList[index].ifLike ? this.commentVOList[index].likes + 1 :
+        //     this.commentVOList[index].likes - 1
+        if (this.commentList[index].ifLike === 1) {
+          this.commentList[index].ifLike = 0
+          this.commentList[index].likes = this.commentList[index].likes - 1
+        } else {
+          uni.showToast({
+            title: "点赞成功",
+            icon: 'none'
+          })
+          this.commentList[index].likes = this.commentList[index].likes + 1
+          //console.log(this.commentList[index].likes, 'num')
+          this.commentList[index].ifLike = 1
+        }
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    // 点击分享
+    clickShare() {
+      // #ifdef APP-PLUS
+      var system = 1
+      // #endif
+
+      // #ifdef H5
+      var system = 3
+      // #endif
+
+      // #ifdef MP-WEIXIN
+      var system = 2
+      // #endif
+
+      // #ifdef MP-ALIPAY
+      var system = 4
+      // #endif
+      uni.showLoading({
+        mask: true,
+        title: '请稍候...'
+      })
+      NET.request(API.getSharePic, {
+        productId: this.productData.productId,
+        shopId: this.productData.shopId,
+        skuId: this.paramSkuId,
+        terminal: system
+      }, 'GET').then(res => {
+        uni.hideLoading()
+        // 推广商品
+        uni.navigateTo({
+          url: `../../pages_category_page1/distributionModule/shareProduct?shareImg=${res.data}&shopId=${this.productData.shopId}&productId=${this.productData.productId}&skuId=${this.paramSkuId}`
+        });
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    //立即购买
+    addFast(type) {
+      //判断是否登录
+      let item = {}
+      if (uni.getStorageSync('storage_key')) {
+        item = uni.getStorageSync('storage_key');
+      }
+      if (JSON.stringify(item) === '{}') {
+        uni.navigateTo({
+          url: '../../pages_category_page2/userModule/login'
+        })
+      } else {
+        if (type === 1) {
+          this.ifWork = 1
+        } else {
+          this.ifWork = 0
+        }
+        if (this.selectedSku.stockNumber < 1) {
+          uni.showToast({
+            title: '库存不足',
+            icon: "none"
+          })
+        } else if (this.buyNum > this.selectedSku.stockNumber && this.selectedSku.stockNumber !== 0) {
+          uni.showToast({
+            title: '已超出最大数量限制',
+            icon: "none"
+          })
+        } else {
+          let list = [{
+            ifWork: this.ifWork,
+            shopId: '',
+            shopName: '',
+            shopDiscountId: null,
+            shopSeckillId: null,
+            skus: [ //商品明细
+              {
+                productId: 0,
+                skuId: 0,
+                productName: "",
+                image: "",
+                price: 0,
+                weight: 0,
+                number: 0,
+                SKU: "",
+                total: 0,
+                ifLogistics: 1
+              }
+            ]
+          }]
+          list[0].shopId = this.productData.shopId
+          list[0].shopName = this.productData.shopName
+          list[0].skus[0].productId = this.productData.productId
+          list[0].skus[0].skuId = this.selectedSku.skuId
+          list[0].skus[0].productName = this.productData.productName
+          list[0].skus[0].image = this.selectedSku.image
+          list[0].skus[0].number = this.buyNum
+          if (type === 1) {
+            list[0].skus[0].price = this.selectedSku.originalPrice
+            list[0].skus[0].total = this.selectedSku.originalPrice * this.buyNum
+          } else {
+            list[0].skus[0].price = this.selectedSku.price
+            list[0].skus[0].total = this.selectedSku.price * this.buyNum
+          }
+
+          //list[0].skus[0].ifLogistics = this.skuProdList.ifLogistics
+          if (this.shopSeckillId > 0) {
+            list[0].shopSeckillId = this.shopSeckillId
+          }
+          //console.log(this.shopDiscountId,555)
+          if (this.shopDiscountId > 0) {
+            list[0].shopDiscountId = this.shopDiscountId
+          }
+          uni.setStorageSync('skuItemDTOList', list)
+          this.goodsDetailShowFlag = false
+          uni.navigateTo({
+            url: '../orderModule/orderConfirm?type=1',
+          })
+          this.buyNum = 1
+        }
+      }
+    },
+    bindSalesCustomer(salesId, storeId) {
+      if (salesId && storeId) {
+        //如果已登录，静默绑定客户关系，否则跳转到登录页面
+        if (uni.getStorageSync('storage_key')) {
+          NET.request(API.BindSalesCustomer, {
+            shopId: storeId,
+            distributorId: salesId
+          }, 'POST').then(res => {
+            uni.showToast({
+              title: "绑定成功",
+              icon: "none"
+            })
+          }).catch(res => {
+            uni.showToast({
+              title: res.data.msg,
+              icon: "none"
+            })
+          })
+        } else {
+          uni.setStorageSync('salesId', salesId)
+          uni.setStorageSync("shopId", storeId)
+          uni.navigateTo({
+            url: '../../pages_category_page2/userModule/login'
+          })
+        }
+      }
+    },
+    openAllBuy() {
+      this.showGroupBuyList = true
+    },
+    openAllBuyTwo() {
+      uni.showToast({
+        title: "还没有人拼单，快去拼单吧！",
+        icon: "none"
+      })
+    },
+    getServiceUrl() {
+      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') || []
+
+      const index = shopids.indexOf(this.shopId)
+      if (index === -1) {
+        this.isLoading = true
+        const id = this.shopId || null
+        NET.request(API.CustomerService, {
+          id
+        }, 'get').then(res => {
+          if (res.code === '' && res.data.corpId && res.data.url) {
+            shopids.push(this.shopId)
+            corpIds.push(res.data.corpId)
+            urls.push(res.data.url)
+
+            uni.setStorageSync('service_shopids', shopids);
+            uni.setStorageSync('service_corpIds', corpIds);
+            uni.setStorageSync('service_urls', urls);
+
+            this.corpId = res.data.corpId
+            this.serviceURL = res.data.url
+            if (this.serviceURL) {
+              this.hasService = true
+            }
+          }
+          this.isLoading = false
+        }).catch(err => {
+          console.log(err)
+          this.isLoading = false
+        })
+      } else {
+        this.corpId = corpIds[index]
+        this.serviceURL = urls[index]
+        if (this.serviceURL) {
+          this.hasService = true
+        }
+      }
+    },
+    flyToService() {
+      let self = this
+      console.log(self.serviceURL, self.corpId)
+      if (!self.serviceURL || !self.corpId) {
+        self.hasService = false
+        return
+      }
+      wx.openCustomerServiceChat({
+        extInfo: {
+          url: self.serviceURL
+        },
+        corpId: self.corpId, // 企业ID
+        success(res) {
+        },
+        fail(err) {
+        }
+      })
+    },
+  }
+}
 </script>
 
 <style lang="scss">
-	.page {
-		background-color: #F7F7F7;
-	}
-
-	.skuSelectBtn {
-		padding-bottom: 30rpx;
-
-		.selectBtn {
-			width: 342rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			border: 2rpx solid #333333;
-			font-size: 28rpx;
-		}
-
-		.selectBuyNow {
-			background: #333333;
-		}
-	}
-
-	.couponItemimg {
-		width: 150upx;
-		height: 60upx;
-	}
-
-	.tabsbox {
-		width: 100%;
-		margin-top: 20rpx;
-		background-color: #FFFFFF;
-	}
-
-	.joinbuyBut {
-		width: 190upx;
-		height: 80upx;
-		background: #333333;
-		color: #FFEBC4;
-		font-size: 28upx;
-		line-height: 80upx;
-		text-align: center;
-		margin-left: 30upx;
-	}
-
-	.checkimg {
-		width: 40upx;
-		height: 40upx;
-		margin-right: 30upx;
-	}
-
-	.container {
-		padding-bottom: 180upx;
-
-		.arrow-icon {
-			width: 16upx;
-			height: 24upx;
-		}
-
-		.goodsImgswiper-box {
-			width: 750upx;
-			height: 750upx;
-
-			.goodsImg {
-				width: 750upx;
-				height: 750upx;
-			}
-		}
-
-		.share-box {
-			width: 200upx;
-			height: 60upx;
-			background-color: #FFFFFF;
-			border-radius: 30upx 0 0 30upx;
-			position: absolute;
-			top: 30upx;
-			right: 0;
-			z-index: 99;
-
-			.share-img {
-				width: 36upx;
-				height: 36upx;
-			}
-		}
-
-		.goodgDes-box {
-			background-color: #FFFFFF;
-			width: 100%;
-			padding-bottom: 25upx;
-
-			.priceBuyNum-box {
-				width: 677upx;
-				margin-top: 30upx;
-			}
-
-			.nameContainer {
-				display: flex;
-
-				.goodsName-box {
-					width: 677upx;
-					height: 85upx;
-
-					.img618-cion {
-						width: 70upx;
-						height: 36upx;
-					}
-				}
-
-				.collectBox {
-					width: 80rpx;
-					margin: 0 30rpx 0 15rpx;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-				}
-
-				.store-icon {
-					width: 48upx;
-					height: 48upx;
-				}
-			}
-
-			.discounts-box {
-				margin-top: 20upx;
-
-				.discounts-text {
-					margin-left: 10upx;
-					color: #FF7800;
-					background-color: #FFE4CC;
-					padding: 6upx 12upx;
-					border-radius: 4upx;
-				}
-			}
-
-			.activity-box {
-				display: flex;
-				flex-direction: row;
-				justify-content: center;
-				align-items: flex-end;
-				border-top: 1upx solid #EDEDED;
-
-				.activity-content {
-					width: 614upx;
-					padding-top: 20upx;
-
-					.activity-text {
-						color: #FF7700;
-						border: 1upx solid #FF7700;
-						padding: 6upx 23upx;
-					}
-
-					.coupon-arrow {
-						width: 16upx;
-						height: 24upx;
-						margin-left: 15upx;
-					}
-				}
-			}
-		}
-
-		.express-box {
-			height: 100upx;
-			background-color: #FFFFFF;
-			padding-left: 30rpx;
-			border-top: 12rpx solid #F8F8F8;
-			border-bottom: 12rpx solid #F8F8F8;
-
-			image {
-				width: 21rpx;
-				height: 27rpx;
-			}
-
-			.expressSite-icon {
-				width: 30upx;
-				height: 30upx;
-			}
-
-			.mapName {
-				position: relative;
-
-				&:before {
-					content: '';
-					width: 2rpx;
-					height: 30rpx;
-					background: #CCCCCC;
-					display: block;
-					position: absolute;
-					right: -16rpx;
-					top: 5rpx;
-				}
-			}
-		}
-
-		.chooseSize-box {
-			height: 90upx;
-			background-color: #FFFFFF;
-
-			.chooseSize-content {
-				width: 720upx;
-			}
-		}
-
-		.evaluate-box {
-			background-color: #FFFFFF;
-			margin-top: 20upx;
-
-			.evaluate {
-				width: 690upx;
-				padding: 20upx 0;
-				border-bottom: 1upx solid #EDEDED;
-			}
-
-			.evaluateTitle-box {
-				width: 690upx;
-				border-bottom: 1upx solid #EDEDED;
-				padding-bottom: 20upx;
-			}
-
-			.evaluateAllArrow-icon {
-				width: 18upx;
-				height: 24upx;
-			}
-
-			.evaluateTag-box {
-				margin-top: 10upx;
-				margin-left: 10upx;
-				padding-bottom: 10upx;
-				display: flex;
-				flex-wrap: wrap;
-
-				.evaluateTag-text {
-					background-color: #F4F4F4;
-					border-radius: 6upx;
-					padding: 16upx 14upx;
-					color: #656565;
-					margin-left: 20upx;
-					margin-top: 20upx;
-				}
-			}
-
-			.evaluate-contentbox {
-				display: flex;
-				justify-content: center;
-				flex-direction: column;
-				margin-left: 30upx;
-				// border-bottom: 1upx solid #EDEDED;
-				padding-bottom: 50upx;
-
-				.evaluate-content {
-					width: 670upx;
-					display: flex;
-					justify-content: space-between;
-
-					.user-headSmallImg {
-						width: 46upx;
-						height: 46upx;
-						border-radius: 50%;
-					}
-				}
-
-				.evaluateDes-box {
-					width: 670upx;
-					margin-top: 30upx;
-
-					.evaluateDes {
-						width: 670upx;
-					}
-				}
-
-				.addEvaluate {
-					padding-top: 30upx;
-				}
-			}
-		}
-
-		.questions {
-			.questionInfo {
-				padding: 0 30upx;
-				min-height: 150upx;
-
-				.infoTit {
-					font-size: 28upx;
-				}
-
-				.putQuestion {
-					width: 140upx;
-					height: 60upx;
-					background: #333333;
-					line-height: 60upx;
-					font-size: 24upx;
-					color: #FFEBC4;
-					padding-left: 20rpx;
-					position: relative;
-
-					&:before {
-						content: '';
-						width: 60rpx;
-						height: 60rpx;
-						background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
-						background-size: contain;
-						display: block;
-						position: absolute;
-						right: 0;
-					}
-				}
-			}
-
-			.listBox {
-				padding: 0 30upx;
-				border-bottom: 20upx solid #EEEEEE;
-
-				.itemBox {
-					padding-bottom: 30upx;
-					border-bottom: 1upx solid #EEEEEE;
-					margin-bottom: 30upx;
-
-					&:last-child {
-						border-bottom: none;
-					}
-
-					.itemAsk {
-						display: flex;
-						align-items: center;
-						margin-bottom: 42upx;
-
-						i {
-							font-style: normal;
-							width: 38upx;
-							height: 38upx;
-							line-height: 38upx;
-							background: #C5AA7B;
-							display: block;
-							margin-right: 30upx;
-							font-size: 24upx;
-							color: #FFFFFF;
-							text-align: center;
-						}
-
-						span {
-							font-size: 28upx;
-							color: #333333;
-						}
-					}
-
-					.answer {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						margin-bottom: 30upx;
-
-						.answerBox {
-							display: flex;
-							align-items: center;
-
-							i {
-								font-style: normal;
-								width: 38upx;
-								height: 38upx;
-								line-height: 38upx;
-								background: #C5AA7B;
-								display: block;
-								text-align: center;
-								margin-right: 30upx;
-								font-size: 24rpx;
-								color: #FFFFFF;
-							}
-
-							span {
-								font-size: 26upx;
-								color: #666666;
-							}
-						}
-
-						.answerBtn {
-							width: 130upx;
-							height: 50upx;
-							line-height: 50upx;
-							border: #333333 2rpx solid;
-							text-align: center;
-							color: #333;
-							font-size: 24upx;
-						}
-					}
-
-					.seeAll {
-						margin-left: 68upx;
-						font-size: 28upx;
-						color: #C5AA7B;
-					}
-				}
-			}
-		}
-
-		.questionTit {
-			height: 90upx;
-			border-bottom: 1upx solid #EEEEEE;
-			margin-right: 35upx;
-			color: #333333;
-			font-size: 30upx;
-
-			.allMoreBox {
-				display: flex;
-				align-items: center;
-				color: #999999;
-				font-size: 24upx;
-
-				.evaluateAllArrow-icon {
-					width: 18upx;
-					height: 24upx;
-				}
-			}
-		}
-
-		.shopEvaList {
-			display: flex;
-			padding: 30upx;
-			flex-wrap: wrap;
-			border-bottom: 20upx solid #EEEEEE;
-
-			.shopEvaItem {
-				padding: 0 14upx;
-				height: 60upx;
-				background: #ffe4cc;
-				border-radius: 6upx;
-				line-height: 60upx;
-				text-align: center;
-				font-size: 28upx;
-				color: #666666;
-				margin: 0 20upx 20upx 0;
-			}
-		}
-
-		.storeEvaluate-box {
-			background-color: #FFFFFF;
-			margin-top: 20upx;
-
-			.storeEvaluate {
-				width: 690upx;
-				padding: 20upx 0;
-				border-bottom: 1upx solid #EDEDED;
-			}
-
-			.storeEvaluateTag-box {
-				margin-top: 10upx;
-				margin-left: 10upx;
-				padding-bottom: 30upx;
-				display: flex;
-				flex-wrap: wrap;
-
-				.storeEvaluateTag-text {
-					background-color: #FFE4CC;
-					border-radius: 6upx;
-					padding: 16upx 14upx;
-					color: #656565;
-					margin-left: 20upx;
-					margin-top: 20upx;
-				}
-			}
-		}
-
-		.inStore-box {
-			background-color: #FFFFFF;
-			margin-top: 20upx;
-			padding: 20upx 30upx;
-
-			.inStore-logo {
-				width: 70upx;
-				height: 70upx;
-			}
-
-			.inStore-but {
-				width: 140upx;
-				height: 60upx;
-				line-height: 60upx;
-				text-align: left;
-				font-size: 24upx;
-				color: #FFEBC4;
-				background: #333333;
-				padding-left: 20rpx;
-				position: relative;
-
-				&:before {
-					content: '';
-					width: 60rpx;
-					height: 60rpx;
-					background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
-					background-size: contain;
-					display: block;
-					position: absolute;
-					right: 0;
-				}
-			}
-		}
-
-		.goodsDetails-box {
-			background-color: #FFFFFF;
-			margin-top: 20upx;
-			padding: 20upx 30upx;
-
-			.goodsDetails-title {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-
-				.goodsDetails-Line {
-					width: 265upx;
-					border-bottom: 1upx solid #EDEDED;
-				}
-
-				.goodsDetails-text {
-					padding: 0 22upx;
-				}
-			}
-
-			.goodsDetailsimg-box {}
-		}
-
-		.priceExplain-box {
-			background-color: #FFFFFF;
-			margin-top: 20upx;
-			padding: 20upx 30upx;
-
-			.priceExplain-title {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-
-				.priceExplain-Line {
-					width: 265upx;
-					border-bottom: 1upx solid #EDEDED;
-				}
-
-				.priceExplain-text {
-					padding: 0 22upx;
-				}
-			}
-
-			.priceExplain-dot {
-				width: 9upx;
-				height: 9upx;
-				border: 1upx solid #FF7700;
-				border-radius: 50%;
-				background-color: #FF7700;
-			}
-		}
-
-		.buygoods-box {
-			position: fixed;
-			bottom: 0upx;
-			box-sizing: border-box;
-
-			.buygoodsBut-box {
-				background-color: #FFFFFF;
-				width: 750upx;
-				padding: 20upx 32upx;
-				box-shadow: 0upx 0upx 10upx 1upx #EDEDED;
-				box-sizing: border-box;
-				display: flex;
-				justify-content: space-between;
-
-				.btns_container {
-					display: flex;
-					align-items: center;
-				}
-
-				.btns {
-					width: 80rpx;
-				}
-
-				.Cart {
-					position: relative;
-
-					.cartAllNum {
-						position: absolute;
-						width: 30rpx;
-						height: 30rpx;
-						line-height: 30rpx;
-						text-align: center;
-						font-size: 17rpx;
-						color: #FFFFFF;
-						background: #C5AA7B;
-						border-radius: 50%;
-						opacity: 1;
-						z-index: 999;
-					}
-
-					// #ifdef APP-PLUS
-					.cartAllNum {
-						right: -6rpx;
-						top: -6rpx;
-					}
-
-					// #endif
-					/* #ifdef H5 */
-					.cartAllNum {
-						right: -10rpx;
-						top: -6rpx;
-					}
-
-					/* #endif */
-					/* #ifdef MP-WEIXIN */
-					.cartAllNum {
-						right: -3rpx;
-						top: 0;
-					}
-
-					/* #endif */
-				}
-
-				.store-icon {
-					width: 48upx;
-					height: 48upx;
-				}
-
-				.joinShopCartBut {
-					width: 190upx;
-					height: 80upx;
-					background-color: #FFFFFF;
-					color: #333333;
-					font-size: 28upx;
-					line-height: 80upx;
-					border: 2rpx solid #333333;
-					text-align: center;
-					margin-left: 40upx;
-					box-sizing: border-box;
-				}
-
-				.buyNowBut {
-					width: 190upx;
-					height: 80upx;
-					background: #333333;
-					color: #FFEBC4;
-					font-size: 28upx;
-					line-height: 80upx;
-					text-align: center;
-					margin-left: 16upx;
-				}
-
-				.offShelf {
-					background: #b7b7b7;
-					border-radius: 50upx;
-					width: 360upx;
-					margin-left: 50upx;
-					line-height: 80upx;
-					height: 80upx;
-					justify-content: center;
-					color: #333333;
-				}
-			}
-		}
-
-		.returnTopService-box {
-			position: fixed;
-			bottom: 160upx;
-			right: 30upx;
-
-			.fs16 {
-				font-size: 16upx;
-			}
-
-			.returnTop-box {
-				width: 88upx;
-				height: 88upx;
-				border-radius: 50%;
-				background: #FFFFFF;
-				opacity: 0.8;
-
-				.returnTopImg {
-					width: 58upx;
-					height: 58upx;
-				}
-			}
-
-			.serviceImg-box {
-				width: 90upx;
-				height: 90upx;
-				border-radius: 50%;
-				background-color: #FFFFFF;
-				box-shadow: 0upx 0upx 5upx 3upx #999999;
-
-				.serviceImg {
-					width: 36upx;
-					height: 36upx;
-					display: block;
-					background: url("https://ceres.zkthink.com/static/images/serviceImg.png") no-repeat center center;
-					background-size: contain;
-				}
-			}
-		}
-
-		.goosDetailshow-box {
-			.detailImg-box {
-				margin-top: 30upx;
-				margin-left: 30upx;
-				border-bottom: 1upx solid #EDEDED;
-				padding-bottom: 20upx;
-				width: 690upx;
-
-				.detailImg {
-					width: 180upx;
-					height: 180upx;
-				}
-			}
-
-			.color-box {
-				padding: 30upx 30upx;
-				width: 690upx;
-
-				.colorName-box {
-					display: flex;
-					flex-wrap: wrap;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 30upx;
-					margin-left: -30upx;
-
-					.colorName {
-						background-color: #FFFFFF;
-						margin-left: 30upx;
-						padding: 10upx 32upx;
-						font-size: 26upx;
-						border: 2rpx solid #E4E5E6;
-						z-index: 2;
-						color: #333333;
-					}
-
-					.colorName-on {
-						box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
-						color: #C5AA7B;
-						margin-left: 30upx;
-						padding: 10upx 32upx;
-						font-size: 26upx;
-						text-align: center;
-						z-index: 1;
-						border: none;
-					}
-				}
-
-			}
-
-			.modelNum-box {
-				padding: 30upx 30upx;
-				border-bottom: 1upx solid #EDEDED;
-				width: 690upx;
-
-				.modelNumName-box {
-					display: flex;
-					flex-wrap: wrap;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 30upx;
-					margin-left: -30upx;
-
-					.modelNumName-on {
-						background-color: #FFE4D0;
-						color: #FF7800;
-						margin-left: 30upx;
-						padding: 10upx 32upx;
-						border-radius: 28upx;
-						border: 1upx solid #FF7800;
-						font-size: 26upx;
-						text-align: center;
-					}
-
-					.modelNumName {
-						background-color: #F5F5F5;
-						margin-left: 30upx;
-						padding: 10upx 32upx;
-						border-radius: 28upx;
-						font-size: 26upx;
-					}
-				}
-			}
-
-			.goodsNumCent {
-				padding: 0 30upx;
-
-				.goodsNum-box {
-					width: 100%;
-					padding: 30rpx 0 180rpx 0;
-					border-top: 2rpx solid #EDEDED;
-
-					.goodsNum {
-						height: 50upx;
-						display: flex;
-						align-items: center;
-
-						.item {
-							width: 50upx;
-							height: 50upx;
-							line-height: 48rpx;
-							border: 1upx solid #999999;
-							text-align: center;
-						}
-
-						.subtract {
-							border-right: 0upx;
-						}
-
-						.goodsNumber {
-							line-height: 50rpx;
-						}
-
-						.add {
-							border-left: 0upx;
-						}
-					}
-				}
-			}
-
-			.bottom-line {
-				border-bottom: 1upx solid #EDEDED;
-			}
-
-			.huabei-box {
-				padding: 30upx 30upx;
-				width: 690upx;
-
-				.fenqi-box {
-					margin-top: 15upx;
-					width: 120%;
-
-					.huabei-item {
-						display: inline-block;
-						background: #f3f3f3;
-						padding: 16upx 24upx;
-						margin: 5upx 10upx;
-						border-radius: 15upx;
-						text-align: center;
-						font-size: 7upx;
-
-						.huabei-period {
-							display: block;
-						}
-					}
-
-					.fenqi-on {
-						border: 1px solid #EF7F93;
-						color: #EF7F93;
-					}
-
-					.disabled {
-						color: #cacaca;
-					}
-				}
-			}
-
-			.goosDetailbut-box {
-				justify-content: center;
-
-				.joinShopCartBut {
-					width: 343upx;
-					height: 80upx;
-					border-radius: 40upx 0 0 40upx;
-					background-color: #FFC300;
-					color: #FFFEFE;
-					font-size: 28upx;
-					line-height: 80upx;
-					text-align: center;
-					margin-left: 30upx;
-				}
-
-				.buyNowBut {
-					width: 90%;
-					height: 90upx;
-					background-color: #333333;
-					font-size: 28upx;
-					line-height: 90upx;
-					text-align: center;
-					color: #FFEBC4;
-				}
-			}
-		}
-
-		.parameterShow-box {
-			.parameter-title {
-				width: 100%;
-				text-align: center;
-				padding-bottom: 36upx;
-			}
-
-			.parameter-modle {
-				width: 690upx;
-				padding-bottom: 36upx;
-				font-size: 26upx;
-			}
-
-			.parameterTruebut-box {
-				background-color: #FFFFFF;
-				padding: 20upx 0;
-
-				.parameterTruebut {
-					width: 690upx;
-					height: 80upx;
-					background-image: linear-gradient(135deg, #FFA100 10%, #FF7911 100%);
-					color: #FFFFFF;
-					border-radius: 40upx;
-					line-height: 80upx;
-					text-align: center;
-					font-size: 26upx;
-				}
-			}
-		}
-
-		.couponShow-box {
-			.couponShow {
-				z-index: 333;
-				height: 1000rpx;
-
-				.couponTitle-box {
-					width: 100%;
-				}
-
-				.coupon-title-active {
-					color: #FF7700;
-					border-bottom: 2upx solid #FF7700;
-					padding-bottom: 30upx;
-				}
-
-				.usableCoupon-content {
-					padding: 30upx 0;
-
-					.usableCoupon-box {
-						width: 690upx;
-						height: 140upx;
-						border-radius: 10upx;
-						background-color: #FFE9D8;
-
-						.immediateUse-but {
-							color: #FF7800;
-							border-radius: 30upx;
-							padding: 0 40upx;
-							border-left: 3upx solid #EBD7C7;
-							height: 140upx;
-							border-radius: 60upx;
-							line-height: 140upx;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-		}
-
-		.succeedShow-box {
-			position: absolute;
-			top: 220upx;
-			left: 185upx;
-
-			.succeedShow {
-				background-color: #7F7F7F;
-				width: 380upx;
-				height: 280upx;
-				border-radius: 10upx;
-				opacity: 0.8;
-
-				.couponSucceedImg {
-					width: 200upx;
-					height: 130upx;
-				}
-			}
-		}
-
-		.evaQaTab {
-			height: 82rpx;
-			line-height: 82rpx;
-			border-bottom: #F3F4F5 solid 2rpx;
-			font-size: 30rpx;
-			color: #CCCCCC;
-
-			.evaBtn {
-				width: 50%;
-				position: relative;
-				text-align: center;
-
-				&:before {
-					content: '';
-					width: 2rpx;
-					height: 30rpx;
-					background: #CCCCCC;
-					display: block;
-					position: absolute;
-					right: 0;
-					top: 20rpx;
-				}
-			}
-
-			.qaBtn {
-				width: 50%;
-				text-align: center;
-			}
-
-			.tabTit {
-				display: inline-block;
-				height: 82rpx;
-				line-height: 82rpx;
-			}
-
-			.active {
-				color: #333333;
-
-				.tabTit {
-					border-bottom: 4rpx solid #444444;
-				}
-			}
-		}
-
-		.moreBox {
-			width: 170rpx;
-			height: 54rpx;
-			line-height: 54rpx;
-			margin: 0 auto 50rpx auto;
-			border: 2rpx solid #C5AA7B;
-			color: #C5AA7B;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			image {
-				width: 10rpx;
-				height: 20rpx;
-			}
-		}
-	}
-
-	.activity-box {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-	.activity-box .title-box {
-		width: 100%;
-		height: 100upx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		border-bottom: solid 1px #EEEEEE;
-	}
-
-	.activity-coupon-box {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		overflow: auto;
-		flex: 1;
-	}
-
-	.content-box {
-		width: 100%;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-		padding: 30upx;
-	}
-
-	.tag-box {
-		width: 100%;
-		box-sizing: border-box;
-		height: 80upx;
-		line-height: 80upx;
-		font-size: 28upx;
-		font-weight: 500;
-		color: #FF7911;
-	}
-
-	.label-lingqu {
-		width: 100%;
-		font-weight: 500;
-		color: rgba(51, 51, 51, 1);
-	}
-
-	.coupon-item {
-		width: 690upx;
-		height: 120upx;
-		border-radius: 10upx;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 20upx;
-		flex-shrink: 0;
-		background-color: #FFE9D8;
-	}
-
-	.money-box {
-		width: 160upx;
-		box-sizing: border-box;
-		padding-left: 30upx;
-		font-weight: 500;
-		color: #FF7911;
-	}
-
-	.info-box {
-		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-		color: rgba(255, 121, 17, 1);
-	}
-
-	.receive-btn {
-		width: 200upx;
-		height: 120upx;
-		background: rgba(255, 233, 216, 1);
-		box-shadow: 0px 0px 5upx 0px rgba(102, 102, 102, 0.35);
-		line-height: 120upx;
-		text-align: center;
-		font-size: 28upx;
-		font-weight: bold;
-		color: rgba(255, 121, 17, 1);
-		border-bottom-right-radius: 10upx;
-		border-top-right-radius: 10upx;
-		border-top-left-radius: 120upx;
-		border-bottom-left-radius: 120upx;
-	}
-
-	.received {
-		background: #f1f1f1;
-		color: #999;
-	}
-
-
-
-	.item-image-box {
-		width: 700upx;
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-	}
-
-	.img-item {
-		width: 223upx;
-		height: 223upx;
-		border-radius: 10upx;
-		margin-right: 10upx;
-		margin-top: 10upx;
-	}
-
-	.item-line {
-		width: 690upx;
-		height: 1px;
-		background: rgba(238, 238, 238, 1);
-		margin-top: 20upx;
-	}
-
-	.item-like-box {
-		display: flex;
-		flex-direction: row;
-		width: 690upx;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.like-box {
-		display: flex;
-		flex-direction: row;
-		padding-top: 30upx;
-		align-items: center;
-		justify-content: flex-end;
-		margin-right: 50upx;
-	}
-
-	.like-img {
-		width: 48upx;
-		height: 48upx;
-	}
-
-	.like-num {
-		font-size: 28upx;
-		font-weight: 500;
-		color: rgba(51, 51, 51, 1);
-		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 center;
-		padding: 20rpx 30rpx;
-		background-size: cover;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		.sceneNameBox{
-			width: 220rpx;
-			text-align: center;
-			color: #C83732;
-			font-size: 20rpx;
-		}
-	}
-
-	.seckill-box {
-		width: 100%;
-		background: url("https://ceres.zkthink.com/static/images/storeTop_Img.png") no-repeat left top;
-		padding: 35rpx 30rpx;
-
-		.seckill-icon {
-			width: 187rpx;
-			height: 41rpx;
-			background-size: contain;
-		}
-
-		.vip-icon {
-			width: 187rpx;
-			height: 41rpx;
-			background-size: contain;
-		}
-
-		.discount-icon {
-			width: 187rpx;
-			height: 41rpx;
-			background-size: contain;
-		}
-
-		.spell-icon {
-			width: 182rpx;
-			height: 37rpx;
-			background-size: contain;
-			margin-bottom: 20rpx;
-		}
-
-		.countdown {
-			text-align: center;
-
-			label {
-				text-align: center;
-				color: #CCCCCC;
-			}
-		}
-
-		.countdown-box {
-			padding: 0 8rpx;
-			height: 48rpx;
-			color: #FFEBC4;
-			background-color: #525252;
-			margin: 10rpx;
-		}
-	}
-
-	.goodsDiscount {
-		.groupBuy {
-			.groupBuyList {
-				.groupBuyItem {
-					padding: 0 30upx;
-					height: 116upx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					border-bottom: 1upx solid #EEEEEE;
-
-					.leftAvatar {
-						display: flex;
-						align-items: center;
-						width: 50%;
-
-						img {
-							width: 72upx;
-							height: 72upx;
-							margin-right: 10upx;
-							border-radius: 50%;
-						}
-					}
-
-					.rightInfo {
-						display: flex;
-						align-items: center;
-						width: 50%;
-
-						.groupBuyTime {
-							.needPeople {
-								font-size: 28upx;
-								color: #333333;
-								margin-bottom: 10upx;
-								font-weight: 400;
-
-								b {
-									color: #C5AA7B;
-									font-weight: 400;
-								}
-							}
-
-							.endDate {
-								color: #666666;
-							}
-						}
-
-						.groupBuyBtn {
-							width: 140upx;
-							height: 60upx;
-							line-height: 60upx;
-							background: #333333;
-							text-align: center;
-							color: #FFEBC4;
-							font-size: 24rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.popupDiscount {
-		padding-bottom: 70upx;
-
-		.popupDiscountTit {
-			font-size: 36upx;
-			color: #333333;
-			height: 105upx;
-			line-height: 105upx;
-			text-align: center;
-			border-bottom: 1upx solid #EEEEEE;
-		}
-
-		.groupBuy {
-			padding-bottom: 80upx;
-
-			.groupBuyList {
-				.groupBuyItem1 {
-					padding: 0 30upx;
-					height: 116upx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					border-bottom: 1upx solid #EEEEEE;
-
-					.leftAvatar {
-						display: flex;
-						align-items: center;
-
-						img {
-							width: 72upx;
-							height: 72upx;
-							margin-right: 10upx;
-							border-radius: 50%;
-						}
-
-						.groupBuyTime {
-							margin-right: 80upx;
-							margin-bottom: 10upx;
-							width: 320upx;
-
-							.needPeople {
-								font-size: 26upx;
-								color: #333333;
-
-								span {
-									color: #333333;
-									padding-right: 10upx;
-								}
-
-								b {
-									color: #C5AA7B;
-									font-weight: 400;
-								}
-							}
-
-							.endDate {
-								color: #333333;
-								opacity: 0.7;
-								font-size: 24rpx;
-							}
-						}
-					}
-
-					.rightInfo {
-						display: flex;
-						align-items: center;
-
-						.groupBuyBtn {
-							width: 140upx;
-							height: 70upx;
-							line-height: 70upx;
-							background: #333333;
-							text-align: center;
-							color: #FFEBC4;
-							font-weight: 400;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.combination {
-		padding: 0 20rpx;
-
-		.combinationList {
-			width: 100%;
-			height: 680rpx;
-			background: #333333;
-			box-shadow: 0 20rpx 30rpx rgba(0, 0, 0, 0.3);
-			border-radius: 20rpx;
-
-			.combinationTitle {
-				padding: 32rpx 20rpx 0 30rpx;
-
-				image {
-					width: 211rpx;
-					height: 33rpx;
-				}
-
-				.combinationPrice {
-					padding: 0 20px;
-					height: 50rpx;
-					background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
-					box-shadow: 0 6rpx 12rpx rgba(233, 0, 0, 0.3);
-					border-radius: 26rpx;
-					line-height: 50rpx;
-					text-align: center;
-					color: #FFFFFF;
-					opacity: 0.8;
-				}
-			}
-
-			.buyBtn {
-				width: 96%;
-				height: 84rpx;
-				line-height: 84rpx;
-				border: 2rpx solid rgba(0, 0, 0, 0);
-				background: linear-gradient(88deg, #C5AA7B 0%, #FFEBC4 100%);
-				text-align: center;
-				color: #333333;
-				margin: 0 auto;
-			}
-		}
-
-		//.group-list{
-		//  padding: 30upx 20upx 60upx;
-		//  .group-warp{
-		//    width: 710upx;
-		//    height: 528upx;
-		//    padding: 0 2upx;
-		//    background: #333333;
-		//    box-shadow: 0px 20upx 30upx rgba(0, 0, 0, 0.3);
-		//    opacity: 1;
-		//    border-radius: 20upx;
-		//  }
-		//  .title{
-		//    display: flex;
-		//    align-items:center;
-		//    position: relative;
-		//    padding: 40upx 0 30upx 20upx;
-		//    .title-img{
-		//      height: 33upx;
-		//    }
-		//    .btn-all{
-		//      position: absolute;
-		//      right: 8upx;
-		//      top: 40upx;
-		//      line-height: 33upx;
-		//      padding-right: 25upx;
-		//      font-size: 24upx;
-		//      color: #FFEBC4;
-		//      .iconfont{
-		//        content: '';
-		//        font-size: 26upx;
-		//        position: absolute;
-		//        right: 0;
-		//        top: 0;
-		//      }
-		//    }
-		//  }
-		//  .pro-box{
-		//    padding-bottom: 20upx;
-		//    .pro-item{
-		//      width: 220upx;
-		//      height: 382upx;
-		//      background: #FFFFFF;
-		//      .pro-item-img{
-		//        .img{
-		//          width: 100%;
-		//          height: 220upx;
-		//        }
-		//      }
-		//      &-inner{
-		//        padding: 0 8upx;
-		//      }
-		//      .pro-item-info{
-		//        text-align: center;
-		//        padding: 0px 10upx 20upx;
-		//        .name{
-		//          font-size: 24upx;
-		//          font-weight: normal;
-		//          color: #FFEBC4;
-		//          line-height: 50upx;
-		//          background-color: #333333;
-		//          text-align: center;
-		//          margin-bottom: 18upx;
-		//          display: block;
-		//        }
-		//        .price{
-		//          color: #C83732;
-		//          font-size: 28upx;
-		//          font-weight: bold;
-		//          line-height: 40upx;
-		//        }
-		//        .buyCount{
-		//          font-size: 24upx;
-		//          color: #ccc;
-		//          line-height: 34upx;
-		//          font-weight: normal;
-		//        }
-		//      }
-		//    }
-		//  }
-		//  .pagination{
-		//    display: flex;
-		//    justify-content: center;
-		//    ::v-deep .swiper-pagination-bullet{
-		//      width: 24upx;
-		//      height: 4upx;
-		//      background: #fff;
-		//      opacity: 0.5;
-		//      border-radius: 2upx;
-		//      margin: 0 5upx;
-		//    }
-		//    ::v-deep .swiper-pagination-bullet-active{
-		//      opacity: 1;
-		//    }
-		//  }
-		//}
-	}
+.page {
+  background-color: #F7F7F7;
+}
+
+.skuSelectBtn {
+  padding-bottom: 30rpx;
+
+  .selectBtn {
+    width: 342rpx;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    border: 2rpx solid #333333;
+    font-size: 28rpx;
+  }
+
+  .selectBuyNow {
+    background: #333333;
+  }
+}
+
+.couponItemimg {
+  width: 150upx;
+  height: 60upx;
+}
+
+.tabsbox {
+  width: 100%;
+  margin-top: 20rpx;
+  background-color: #FFFFFF;
+}
+
+.joinbuyBut {
+  width: 190upx;
+  height: 80upx;
+  background: #333333;
+  color: #FFEBC4;
+  font-size: 28upx;
+  line-height: 80upx;
+  text-align: center;
+  margin-left: 30upx;
+}
+
+.checkimg {
+  width: 40upx;
+  height: 40upx;
+  margin-right: 30upx;
+}
+
+.container {
+  padding-bottom: 180upx;
+
+  .arrow-icon {
+    width: 16upx;
+    height: 24upx;
+  }
+
+  .goodsImgswiper-box {
+    width: 750upx;
+    height: 750upx;
+
+    .goodsImg {
+      width: 750upx;
+      height: 750upx;
+    }
+  }
+
+  .share-box {
+    width: 200upx;
+    height: 60upx;
+    background-color: #FFFFFF;
+    border-radius: 30upx 0 0 30upx;
+    position: absolute;
+    top: 30upx;
+    right: 0;
+    z-index: 99;
+
+    .share-img {
+      width: 36upx;
+      height: 36upx;
+    }
+  }
+
+  .goodgDes-box {
+    background-color: #FFFFFF;
+    width: 100%;
+    padding-bottom: 25upx;
+
+    .priceBuyNum-box {
+      width: 677upx;
+      margin-top: 30upx;
+    }
+
+    .nameContainer {
+      display: flex;
+
+      .goodsName-box {
+        width: 677upx;
+        height: 85upx;
+
+        .img618-cion {
+          width: 70upx;
+          height: 36upx;
+        }
+      }
+
+      .collectBox {
+        width: 80rpx;
+        margin: 0 30rpx 0 15rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .store-icon {
+        width: 48upx;
+        height: 48upx;
+      }
+    }
+
+    .discounts-box {
+      margin-top: 20upx;
+
+      .discounts-text {
+        margin-left: 10upx;
+        color: #FF7800;
+        background-color: #FFE4CC;
+        padding: 6upx 12upx;
+        border-radius: 4upx;
+      }
+    }
+
+    .activity-box {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: flex-end;
+      border-top: 1upx solid #EDEDED;
+
+      .activity-content {
+        width: 614upx;
+        padding-top: 20upx;
+
+        .activity-text {
+          color: #FF7700;
+          border: 1upx solid #FF7700;
+          padding: 6upx 23upx;
+        }
+
+        .coupon-arrow {
+          width: 16upx;
+          height: 24upx;
+          margin-left: 15upx;
+        }
+      }
+    }
+  }
+
+  .express-box {
+    height: 100upx;
+    background-color: #FFFFFF;
+    padding-left: 30rpx;
+    border-top: 12rpx solid #F8F8F8;
+    border-bottom: 12rpx solid #F8F8F8;
+
+    image {
+      width: 21rpx;
+      height: 27rpx;
+    }
+
+    .expressSite-icon {
+      width: 30upx;
+      height: 30upx;
+    }
+
+    .mapName {
+      position: relative;
+
+      &:before {
+        content: '';
+        width: 2rpx;
+        height: 30rpx;
+        background: #CCCCCC;
+        display: block;
+        position: absolute;
+        right: -16rpx;
+        top: 5rpx;
+      }
+    }
+  }
+
+  .chooseSize-box {
+    height: 90upx;
+    background-color: #FFFFFF;
+
+    .chooseSize-content {
+      width: 720upx;
+    }
+  }
+
+  .evaluate-box {
+    background-color: #FFFFFF;
+    margin-top: 20upx;
+
+    .evaluate {
+      width: 690upx;
+      padding: 20upx 0;
+      border-bottom: 1upx solid #EDEDED;
+    }
+
+    .evaluateTitle-box {
+      width: 690upx;
+      border-bottom: 1upx solid #EDEDED;
+      padding-bottom: 20upx;
+    }
+
+    .evaluateAllArrow-icon {
+      width: 18upx;
+      height: 24upx;
+    }
+
+    .evaluateTag-box {
+      margin-top: 10upx;
+      margin-left: 10upx;
+      padding-bottom: 10upx;
+      display: flex;
+      flex-wrap: wrap;
+
+      .evaluateTag-text {
+        background-color: #F4F4F4;
+        border-radius: 6upx;
+        padding: 16upx 14upx;
+        color: #656565;
+        margin-left: 20upx;
+        margin-top: 20upx;
+      }
+    }
+
+    .evaluate-contentbox {
+      display: flex;
+      justify-content: center;
+      flex-direction: column;
+      margin-left: 30upx;
+      // border-bottom: 1upx solid #EDEDED;
+      padding-bottom: 50upx;
+
+      .evaluate-content {
+        width: 670upx;
+        display: flex;
+        justify-content: space-between;
+
+        .user-headSmallImg {
+          width: 46upx;
+          height: 46upx;
+          border-radius: 50%;
+        }
+      }
+
+      .evaluateDes-box {
+        width: 670upx;
+        margin-top: 30upx;
+
+        .evaluateDes {
+          width: 670upx;
+        }
+      }
+
+      .addEvaluate {
+        padding-top: 30upx;
+      }
+    }
+  }
+
+  .questions {
+    .questionInfo {
+      padding: 0 30upx;
+      min-height: 150upx;
+
+      .infoTit {
+        font-size: 28upx;
+      }
+
+      .putQuestion {
+        width: 140upx;
+        height: 60upx;
+        background: #333333;
+        line-height: 60upx;
+        font-size: 24upx;
+        color: #FFEBC4;
+        padding-left: 20rpx;
+        position: relative;
+
+        &:before {
+          content: '';
+          width: 60rpx;
+          height: 60rpx;
+          background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
+          background-size: contain;
+          display: block;
+          position: absolute;
+          right: 0;
+        }
+      }
+    }
+
+    .listBox {
+      padding: 0 30upx;
+      border-bottom: 20upx solid #EEEEEE;
+
+      .itemBox {
+        padding-bottom: 30upx;
+        border-bottom: 1upx solid #EEEEEE;
+        margin-bottom: 30upx;
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        .itemAsk {
+          display: flex;
+          align-items: center;
+          margin-bottom: 42upx;
+
+          i {
+            font-style: normal;
+            width: 38upx;
+            height: 38upx;
+            line-height: 38upx;
+            background: #C5AA7B;
+            display: block;
+            margin-right: 30upx;
+            font-size: 24upx;
+            color: #FFFFFF;
+            text-align: center;
+          }
+
+          span {
+            font-size: 28upx;
+            color: #333333;
+          }
+        }
+
+        .answer {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 30upx;
+
+          .answerBox {
+            display: flex;
+            align-items: center;
+
+            i {
+              font-style: normal;
+              width: 38upx;
+              height: 38upx;
+              line-height: 38upx;
+              background: #C5AA7B;
+              display: block;
+              text-align: center;
+              margin-right: 30upx;
+              font-size: 24rpx;
+              color: #FFFFFF;
+            }
+
+            span {
+              font-size: 26upx;
+              color: #666666;
+            }
+          }
+
+          .answerBtn {
+            width: 130upx;
+            height: 50upx;
+            line-height: 50upx;
+            border: #333333 2rpx solid;
+            text-align: center;
+            color: #333;
+            font-size: 24upx;
+          }
+        }
+
+        .seeAll {
+          margin-left: 68upx;
+          font-size: 28upx;
+          color: #C5AA7B;
+        }
+      }
+    }
+  }
+
+  .questionTit {
+    height: 90upx;
+    border-bottom: 1upx solid #EEEEEE;
+    margin-right: 35upx;
+    color: #333333;
+    font-size: 30upx;
+
+    .allMoreBox {
+      display: flex;
+      align-items: center;
+      color: #999999;
+      font-size: 24upx;
+
+      .evaluateAllArrow-icon {
+        width: 18upx;
+        height: 24upx;
+      }
+    }
+  }
+
+  .shopEvaList {
+    display: flex;
+    padding: 30upx;
+    flex-wrap: wrap;
+    border-bottom: 20upx solid #EEEEEE;
+
+    .shopEvaItem {
+      padding: 0 14upx;
+      height: 60upx;
+      background: #ffe4cc;
+      border-radius: 6upx;
+      line-height: 60upx;
+      text-align: center;
+      font-size: 28upx;
+      color: #666666;
+      margin: 0 20upx 20upx 0;
+    }
+  }
+
+  .storeEvaluate-box {
+    background-color: #FFFFFF;
+    margin-top: 20upx;
+
+    .storeEvaluate {
+      width: 690upx;
+      padding: 20upx 0;
+      border-bottom: 1upx solid #EDEDED;
+    }
+
+    .storeEvaluateTag-box {
+      margin-top: 10upx;
+      margin-left: 10upx;
+      padding-bottom: 30upx;
+      display: flex;
+      flex-wrap: wrap;
+
+      .storeEvaluateTag-text {
+        background-color: #FFE4CC;
+        border-radius: 6upx;
+        padding: 16upx 14upx;
+        color: #656565;
+        margin-left: 20upx;
+        margin-top: 20upx;
+      }
+    }
+  }
+
+  .inStore-box {
+    background-color: #FFFFFF;
+    margin-top: 20upx;
+    padding: 20upx 30upx;
+
+    .inStore-logo {
+      width: 70upx;
+      height: 70upx;
+    }
+
+    .inStore-but {
+      width: 140upx;
+      height: 60upx;
+      line-height: 60upx;
+      text-align: left;
+      font-size: 24upx;
+      color: #FFEBC4;
+      background: #333333;
+      padding-left: 20rpx;
+      position: relative;
+
+      &:before {
+        content: '';
+        width: 60rpx;
+        height: 60rpx;
+        background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
+        background-size: contain;
+        display: block;
+        position: absolute;
+        right: 0;
+      }
+    }
+  }
+
+  .goodsDetails-box {
+    background-color: #FFFFFF;
+    margin-top: 20upx;
+    padding: 20upx 30upx;
+
+    .goodsDetails-title {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      .goodsDetails-Line {
+        width: 265upx;
+        border-bottom: 1upx solid #EDEDED;
+      }
+
+      .goodsDetails-text {
+        padding: 0 22upx;
+      }
+    }
+
+    .goodsDetailsimg-box {
+    }
+  }
+
+  .priceExplain-box {
+    background-color: #FFFFFF;
+    margin-top: 20upx;
+    padding: 20upx 30upx;
+
+    .priceExplain-title {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      .priceExplain-Line {
+        width: 265upx;
+        border-bottom: 1upx solid #EDEDED;
+      }
+
+      .priceExplain-text {
+        padding: 0 22upx;
+      }
+    }
+
+    .priceExplain-dot {
+      width: 9upx;
+      height: 9upx;
+      border: 1upx solid #FF7700;
+      border-radius: 50%;
+      background-color: #FF7700;
+    }
+  }
+
+  .buygoods-box {
+    position: fixed;
+    bottom: 0upx;
+    box-sizing: border-box;
+
+    .buygoodsBut-box {
+      background-color: #FFFFFF;
+      width: 750upx;
+      padding: 20upx 32upx;
+      box-shadow: 0upx 0upx 10upx 1upx #EDEDED;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+
+      .btns_container {
+        display: flex;
+        align-items: center;
+      }
+
+      .btns {
+        width: 80rpx;
+      }
+
+      .Cart {
+        position: relative;
+
+        .cartAllNum {
+          position: absolute;
+          width: 30rpx;
+          height: 30rpx;
+          line-height: 30rpx;
+          text-align: center;
+          font-size: 17rpx;
+          color: #FFFFFF;
+          background: #C5AA7B;
+          border-radius: 50%;
+          opacity: 1;
+          z-index: 999;
+        }
+
+        // #ifdef APP-PLUS
+        .cartAllNum {
+          right: -6rpx;
+          top: -6rpx;
+        }
+
+        // #endif
+        /* #ifdef H5 */
+        .cartAllNum {
+          right: -10rpx;
+          top: -6rpx;
+        }
+
+        /* #endif */
+        /* #ifdef MP-WEIXIN */
+        .cartAllNum {
+          right: -3rpx;
+          top: 0;
+        }
+
+        /* #endif */
+      }
+
+      .store-icon {
+        width: 48upx;
+        height: 48upx;
+      }
+
+      .joinShopCartBut {
+        width: 190upx;
+        height: 80upx;
+        background-color: #FFFFFF;
+        color: #333333;
+        font-size: 28upx;
+        line-height: 80upx;
+        border: 2rpx solid #333333;
+        text-align: center;
+        margin-left: 40upx;
+        box-sizing: border-box;
+      }
+
+      .buyNowBut {
+        width: 190upx;
+        height: 80upx;
+        background: #333333;
+        color: #FFEBC4;
+        font-size: 28upx;
+        line-height: 80upx;
+        text-align: center;
+        margin-left: 16upx;
+      }
+
+      .offShelf {
+        background: #b7b7b7;
+        border-radius: 50upx;
+        width: 360upx;
+        margin-left: 50upx;
+        line-height: 80upx;
+        height: 80upx;
+        justify-content: center;
+        color: #333333;
+      }
+    }
+  }
+
+  .returnTopService-box {
+    position: fixed;
+    bottom: 160upx;
+    right: 30upx;
+
+    .fs16 {
+      font-size: 16upx;
+    }
+
+    .returnTop-box {
+      width: 88upx;
+      height: 88upx;
+      border-radius: 50%;
+      background: #FFFFFF;
+      opacity: 0.8;
+
+      .returnTopImg {
+        width: 58upx;
+        height: 58upx;
+      }
+    }
+
+    .serviceImg-box {
+      width: 90upx;
+      height: 90upx;
+      border-radius: 50%;
+      background-color: #FFFFFF;
+      box-shadow: 0upx 0upx 5upx 3upx #999999;
+
+      .serviceImg {
+        width: 36upx;
+        height: 36upx;
+        display: block;
+        background: url("https://ceres.zkthink.com/static/images/serviceImg.png") no-repeat center center;
+        background-size: contain;
+      }
+    }
+  }
+
+  .goosDetailshow-box {
+    margin-bottom: -5upx;
+    .detailImg-box {
+      margin-top: 30upx;
+      margin-left: 30upx;
+      border-bottom: 1upx solid #EDEDED;
+      padding-bottom: 20upx;
+      width: 690upx;
+
+      .detailImg {
+        width: 180upx;
+        height: 180upx;
+      }
+    }
+
+    .color-box {
+      padding: 30upx 30upx;
+      width: 690upx;
+
+      .colorName-box {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 30upx;
+        margin-left: -30upx;
+
+        .colorName {
+          background-color: #FFFFFF;
+          margin-left: 30upx;
+          padding: 10upx 32upx;
+          font-size: 26upx;
+          border: 2rpx solid #E4E5E6;
+          z-index: 2;
+          color: #333333;
+        }
+
+        .colorName-on {
+          box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+          color: #C5AA7B;
+          margin-left: 30upx;
+          padding: 10upx 32upx;
+          font-size: 26upx;
+          text-align: center;
+          z-index: 1;
+          border: none;
+        }
+      }
+
+    }
+
+    .modelNum-box {
+      padding: 30upx 30upx;
+      border-bottom: 1upx solid #EDEDED;
+      width: 690upx;
+
+      .modelNumName-box {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 30upx;
+        margin-left: -30upx;
+
+        .modelNumName-on {
+          background-color: #FFE4D0;
+          color: #FF7800;
+          margin-left: 30upx;
+          padding: 10upx 32upx;
+          border-radius: 28upx;
+          border: 1upx solid #FF7800;
+          font-size: 26upx;
+          text-align: center;
+        }
+
+        .modelNumName {
+          background-color: #F5F5F5;
+          margin-left: 30upx;
+          padding: 10upx 32upx;
+          border-radius: 28upx;
+          font-size: 26upx;
+        }
+      }
+    }
+
+    .goodsNumCent {
+      padding: 0 30upx;
+
+      .goodsNum-box {
+        width: 100%;
+        padding: 30rpx 0 180rpx 0;
+        border-top: 2rpx solid #EDEDED;
+
+        .goodsNum {
+          height: 50upx;
+          display: flex;
+          align-items: center;
+
+          .item {
+            width: 50upx;
+            height: 50upx;
+            line-height: 48rpx;
+            border: 1upx solid #999999;
+            text-align: center;
+          }
+
+          .subtract {
+            border-right: 0upx;
+          }
+
+          .goodsNumber {
+            line-height: 50rpx;
+          }
+
+          .add {
+            border-left: 0upx;
+          }
+        }
+      }
+    }
+
+    .bottom-line {
+      border-bottom: 1upx solid #EDEDED;
+    }
+
+    .huabei-box {
+      padding: 30upx 30upx;
+      width: 690upx;
+
+      .fenqi-box {
+        margin-top: 15upx;
+        width: 120%;
+
+        .huabei-item {
+          display: inline-block;
+          background: #f3f3f3;
+          padding: 16upx 24upx;
+          margin: 5upx 10upx;
+          border-radius: 15upx;
+          text-align: center;
+          font-size: 7upx;
+
+          .huabei-period {
+            display: block;
+          }
+        }
+
+        .fenqi-on {
+          border: 1px solid #EF7F93;
+          color: #EF7F93;
+        }
+
+        .disabled {
+          color: #cacaca;
+        }
+      }
+    }
+
+    .goosDetailbut-box {
+      justify-content: center;
+
+      .joinShopCartBut {
+        width: 343upx;
+        height: 80upx;
+        border-radius: 40upx 0 0 40upx;
+        background-color: #FFC300;
+        color: #FFFEFE;
+        font-size: 28upx;
+        line-height: 80upx;
+        text-align: center;
+        margin-left: 30upx;
+      }
+
+      .buyNowBut {
+        width: 90%;
+        height: 90upx;
+        background-color: #333333;
+        font-size: 28upx;
+        line-height: 90upx;
+        text-align: center;
+        color: #FFEBC4;
+      }
+    }
+  }
+
+  .parameterShow-box {
+    .parameter-title {
+      width: 100%;
+      text-align: center;
+      padding-bottom: 36upx;
+    }
+
+    .parameter-modle {
+      width: 690upx;
+      padding-bottom: 36upx;
+      font-size: 26upx;
+    }
+
+    .parameterTruebut-box {
+      background-color: #FFFFFF;
+      padding: 20upx 0;
+
+      .parameterTruebut {
+        width: 690upx;
+        height: 80upx;
+        background-image: linear-gradient(135deg, #FFA100 10%, #FF7911 100%);
+        color: #FFFFFF;
+        border-radius: 40upx;
+        line-height: 80upx;
+        text-align: center;
+        font-size: 26upx;
+      }
+    }
+  }
+
+  .couponShow-box {
+    .couponShow {
+      z-index: 333;
+      height: 1000rpx;
+
+      .couponTitle-box {
+        width: 100%;
+      }
+
+      .coupon-title-active {
+        color: #FF7700;
+        border-bottom: 2upx solid #FF7700;
+        padding-bottom: 30upx;
+      }
+
+      .usableCoupon-content {
+        padding: 30upx 0;
+
+        .usableCoupon-box {
+          width: 690upx;
+          height: 140upx;
+          border-radius: 10upx;
+          background-color: #FFE9D8;
+
+          .immediateUse-but {
+            color: #FF7800;
+            border-radius: 30upx;
+            padding: 0 40upx;
+            border-left: 3upx solid #EBD7C7;
+            height: 140upx;
+            border-radius: 60upx;
+            line-height: 140upx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+
+  .succeedShow-box {
+    position: absolute;
+    top: 220upx;
+    left: 185upx;
+
+    .succeedShow {
+      background-color: #7F7F7F;
+      width: 380upx;
+      height: 280upx;
+      border-radius: 10upx;
+      opacity: 0.8;
+
+      .couponSucceedImg {
+        width: 200upx;
+        height: 130upx;
+      }
+    }
+  }
+
+  .evaQaTab {
+    height: 82rpx;
+    line-height: 82rpx;
+    border-bottom: #F3F4F5 solid 2rpx;
+    font-size: 30rpx;
+    color: #CCCCCC;
+
+    .evaBtn {
+      width: 50%;
+      position: relative;
+      text-align: center;
+
+      &:before {
+        content: '';
+        width: 2rpx;
+        height: 30rpx;
+        background: #CCCCCC;
+        display: block;
+        position: absolute;
+        right: 0;
+        top: 20rpx;
+      }
+    }
+
+    .qaBtn {
+      width: 50%;
+      text-align: center;
+    }
+
+    .tabTit {
+      display: inline-block;
+      height: 82rpx;
+      line-height: 82rpx;
+    }
+
+    .active {
+      color: #333333;
+
+      .tabTit {
+        border-bottom: 4rpx solid #444444;
+      }
+    }
+  }
+
+  .moreBox {
+    width: 170rpx;
+    height: 54rpx;
+    line-height: 54rpx;
+    margin: 0 auto 50rpx auto;
+    border: 2rpx solid #C5AA7B;
+    color: #C5AA7B;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    image {
+      width: 10rpx;
+      height: 20rpx;
+    }
+  }
+}
+
+.activity-box {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+.activity-box .title-box {
+  width: 100%;
+  height: 100upx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  border-bottom: solid 1px #EEEEEE;
+}
+
+.activity-coupon-box {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  overflow: auto;
+  flex: 1;
+}
+
+.content-box {
+  width: 100%;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  padding: 30upx;
+}
+
+.tag-box {
+  width: 100%;
+  box-sizing: border-box;
+  height: 80upx;
+  line-height: 80upx;
+  font-size: 28upx;
+  font-weight: 500;
+  color: #FF7911;
+}
+
+.label-lingqu {
+  width: 100%;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+}
+
+.coupon-item {
+  width: 690upx;
+  height: 120upx;
+  border-radius: 10upx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20upx;
+  flex-shrink: 0;
+  background-color: #FFE9D8;
+}
+
+.money-box {
+  width: 160upx;
+  box-sizing: border-box;
+  padding-left: 30upx;
+  font-weight: 500;
+  color: #FF7911;
+}
+
+.info-box {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  color: rgba(255, 121, 17, 1);
+}
+
+.receive-btn {
+  width: 200upx;
+  height: 120upx;
+  background: rgba(255, 233, 216, 1);
+  box-shadow: 0px 0px 5upx 0px rgba(102, 102, 102, 0.35);
+  line-height: 120upx;
+  text-align: center;
+  font-size: 28upx;
+  font-weight: bold;
+  color: rgba(255, 121, 17, 1);
+  border-bottom-right-radius: 10upx;
+  border-top-right-radius: 10upx;
+  border-top-left-radius: 120upx;
+  border-bottom-left-radius: 120upx;
+}
+
+.received {
+  background: #f1f1f1;
+  color: #999;
+}
+
+
+.item-image-box {
+  width: 700upx;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+
+.img-item {
+  width: 223upx;
+  height: 223upx;
+  border-radius: 10upx;
+  margin-right: 10upx;
+  margin-top: 10upx;
+}
+
+.item-line {
+  width: 690upx;
+  height: 1px;
+  background: rgba(238, 238, 238, 1);
+  margin-top: 20upx;
+}
+
+.item-like-box {
+  display: flex;
+  flex-direction: row;
+  width: 690upx;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.like-box {
+  display: flex;
+  flex-direction: row;
+  padding-top: 30upx;
+  align-items: center;
+  justify-content: flex-end;
+  margin-right: 50upx;
+}
+
+.like-img {
+  width: 48upx;
+  height: 48upx;
+}
+
+.like-num {
+  font-size: 28upx;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  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 center;
+  padding: 20rpx 30rpx;
+  background-size: cover;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .sceneNameBox {
+    width: 220rpx;
+    text-align: center;
+    color: #C83732;
+    font-size: 20rpx;
+  }
+}
+
+.seckill-box {
+  width: 100%;
+  background: url("https://ceres.zkthink.com/static/images/storeTop_Img.png") no-repeat left top;
+  padding: 35rpx 30rpx;
+
+  .seckill-icon {
+    width: 187rpx;
+    height: 41rpx;
+    background-size: contain;
+  }
+
+  .vip-icon {
+    width: 187rpx;
+    height: 41rpx;
+    background-size: contain;
+  }
+
+  .discount-icon {
+    width: 187rpx;
+    height: 41rpx;
+    background-size: contain;
+  }
+
+  .spell-icon {
+    width: 182rpx;
+    height: 37rpx;
+    background-size: contain;
+    margin-bottom: 20rpx;
+  }
+
+  .countdown {
+    text-align: center;
+
+    label {
+      text-align: center;
+      color: #CCCCCC;
+    }
+  }
+
+  .countdown-box {
+    padding: 0 8rpx;
+    height: 48rpx;
+    color: #FFEBC4;
+    background-color: #525252;
+    margin: 10rpx;
+  }
+}
+
+.goodsDiscount {
+  .groupBuy {
+    .groupBuyList {
+      .groupBuyItem {
+        padding: 0 30upx;
+        height: 116upx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-bottom: 1upx solid #EEEEEE;
+
+        .leftAvatar {
+          display: flex;
+          align-items: center;
+          width: 50%;
+
+          img {
+            width: 72upx;
+            height: 72upx;
+            margin-right: 10upx;
+            border-radius: 50%;
+          }
+        }
+
+        .rightInfo {
+          display: flex;
+          align-items: center;
+          width: 50%;
+
+          .groupBuyTime {
+            .needPeople {
+              font-size: 28upx;
+              color: #333333;
+              margin-bottom: 10upx;
+              font-weight: 400;
+
+              b {
+                color: #C5AA7B;
+                font-weight: 400;
+              }
+            }
+
+            .endDate {
+              color: #666666;
+            }
+          }
+
+          .groupBuyBtn {
+            width: 140upx;
+            height: 60upx;
+            line-height: 60upx;
+            background: #333333;
+            text-align: center;
+            color: #FFEBC4;
+            font-size: 24rpx;
+          }
+        }
+      }
+    }
+  }
+}
+
+.popupDiscount {
+  padding-bottom: 70upx;
+
+  .popupDiscountTit {
+    font-size: 36upx;
+    color: #333333;
+    height: 105upx;
+    line-height: 105upx;
+    text-align: center;
+    border-bottom: 1upx solid #EEEEEE;
+  }
+
+  .groupBuy {
+    padding-bottom: 80upx;
+
+    .groupBuyList {
+      .groupBuyItem1 {
+        padding: 0 30upx;
+        height: 116upx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-bottom: 1upx solid #EEEEEE;
+
+        .leftAvatar {
+          display: flex;
+          align-items: center;
+
+          img {
+            width: 72upx;
+            height: 72upx;
+            margin-right: 10upx;
+            border-radius: 50%;
+          }
+
+          .groupBuyTime {
+            margin-right: 80upx;
+            margin-bottom: 10upx;
+            width: 320upx;
+
+            .needPeople {
+              font-size: 26upx;
+              color: #333333;
+
+              span {
+                color: #333333;
+                padding-right: 10upx;
+              }
+
+              b {
+                color: #C5AA7B;
+                font-weight: 400;
+              }
+            }
+
+            .endDate {
+              color: #333333;
+              opacity: 0.7;
+              font-size: 24rpx;
+            }
+          }
+        }
+
+        .rightInfo {
+          display: flex;
+          align-items: center;
+
+          .groupBuyBtn {
+            width: 140upx;
+            height: 70upx;
+            line-height: 70upx;
+            background: #333333;
+            text-align: center;
+            color: #FFEBC4;
+            font-weight: 400;
+          }
+        }
+      }
+    }
+  }
+}
+
+.combination {
+  padding: 0 20rpx;
+
+  .combinationList {
+    width: 100%;
+    height: 680rpx;
+    background: #333333;
+    box-shadow: 0 20rpx 30rpx rgba(0, 0, 0, 0.3);
+    border-radius: 20rpx;
+
+    .combinationTitle {
+      padding: 32rpx 20rpx 0 30rpx;
+
+      image {
+        width: 211rpx;
+        height: 33rpx;
+      }
+
+      .combinationPrice {
+        padding: 0 20px;
+        height: 50rpx;
+        background: linear-gradient(90deg, #C83732 0%, #E25C44 100%);
+        box-shadow: 0 6rpx 12rpx rgba(233, 0, 0, 0.3);
+        border-radius: 26rpx;
+        line-height: 50rpx;
+        text-align: center;
+        color: #FFFFFF;
+        opacity: 0.8;
+      }
+    }
+
+    .buyBtn {
+      width: 96%;
+      height: 84rpx;
+      line-height: 84rpx;
+      border: 2rpx solid rgba(0, 0, 0, 0);
+      background: linear-gradient(88deg, #C5AA7B 0%, #FFEBC4 100%);
+      text-align: center;
+      color: #333333;
+      margin: 0 auto;
+    }
+  }
+
+  //.group-list{
+  //  padding: 30upx 20upx 60upx;
+  //  .group-warp{
+  //    width: 710upx;
+  //    height: 528upx;
+  //    padding: 0 2upx;
+  //    background: #333333;
+  //    box-shadow: 0px 20upx 30upx rgba(0, 0, 0, 0.3);
+  //    opacity: 1;
+  //    border-radius: 20upx;
+  //  }
+  //  .title{
+  //    display: flex;
+  //    align-items:center;
+  //    position: relative;
+  //    padding: 40upx 0 30upx 20upx;
+  //    .title-img{
+  //      height: 33upx;
+  //    }
+  //    .btn-all{
+  //      position: absolute;
+  //      right: 8upx;
+  //      top: 40upx;
+  //      line-height: 33upx;
+  //      padding-right: 25upx;
+  //      font-size: 24upx;
+  //      color: #FFEBC4;
+  //      .iconfont{
+  //        content: '';
+  //        font-size: 26upx;
+  //        position: absolute;
+  //        right: 0;
+  //        top: 0;
+  //      }
+  //    }
+  //  }
+  //  .pro-box{
+  //    padding-bottom: 20upx;
+  //    .pro-item{
+  //      width: 220upx;
+  //      height: 382upx;
+  //      background: #FFFFFF;
+  //      .pro-item-img{
+  //        .img{
+  //          width: 100%;
+  //          height: 220upx;
+  //        }
+  //      }
+  //      &-inner{
+  //        padding: 0 8upx;
+  //      }
+  //      .pro-item-info{
+  //        text-align: center;
+  //        padding: 0px 10upx 20upx;
+  //        .name{
+  //          font-size: 24upx;
+  //          font-weight: normal;
+  //          color: #FFEBC4;
+  //          line-height: 50upx;
+  //          background-color: #333333;
+  //          text-align: center;
+  //          margin-bottom: 18upx;
+  //          display: block;
+  //        }
+  //        .price{
+  //          color: #C83732;
+  //          font-size: 28upx;
+  //          font-weight: bold;
+  //          line-height: 40upx;
+  //        }
+  //        .buyCount{
+  //          font-size: 24upx;
+  //          color: #ccc;
+  //          line-height: 34upx;
+  //          font-weight: normal;
+  //        }
+  //      }
+  //    }
+  //  }
+  //  .pagination{
+  //    display: flex;
+  //    justify-content: center;
+  //    ::v-deep .swiper-pagination-bullet{
+  //      width: 24upx;
+  //      height: 4upx;
+  //      background: #fff;
+  //      opacity: 0.5;
+  //      border-radius: 2upx;
+  //      margin: 0 5upx;
+  //    }
+  //    ::v-deep .swiper-pagination-bullet-active{
+  //      opacity: 1;
+  //    }
+  //  }
+  //}
+}
 </style>

pages_category_page1/goodsModule/goodsList.vue

@@ -92,14 +92,14 @@
 				source:2,
 				list:[],
 				loadingType:0,
-        sortIndex: 0,
-        ifNew:0,//是否新品
-        type:1,//价格排序条件
-        volume:1,//销量排序条件
+				sortIndex: 1,
+				ifNew:0,//是否新品
+				type:0,//价格排序条件
+				volume:0,//销量排序条件
 				topLeft: 0,
-        ifEmpty: false,
-        noMoreData: false,
-        total: 0
+				ifEmpty: false,
+				noMoreData: false,
+				total: 0
 			}
 		},
 		onLoad(option) {
@@ -129,17 +129,36 @@
         this.total = 0
         this.page = 1
         this.list = []
-        if(index == 1){
-          this.type = 1
-          this.volume = 1
-          this.sortIndex = index
-        }else if(index == 2){
-          this.type = this.type != 1 ? 1:2
-          this.sortIndex = index
-        }else if(index == 3){
-          this.volume = this.volume != 1 ? 1:2
-          this.sortIndex = index
-        }
+        // if(index == 1){
+        //   this.type = 1
+        //   this.volume = 1
+        //   this.sortIndex = index
+        // }else if(index == 2){
+        //   this.type = this.type != 1 ? 1:2
+        //   this.sortIndex = index
+        // }else if(index == 3){
+        //   this.volume = this.volume != 1 ? 1:2
+        //   this.sortIndex = index
+        // }
+		if(index === 1){
+			this.type = 0
+			this.volume = 0
+		}else if(index === 2){
+			this.volume = 0
+			if(this.type === 0){
+				this.type = 1
+			}else{
+				this.type = this.type = 1 ? 2 : 1
+			}
+		}else if (index === 3){
+			this.type = 0
+			if(this.volume === 0){
+				this.volume = 1
+			}else{
+				this.volume = this.volume = 1 ? 2 : 1
+			}
+		}
+		this.sortIndex = index
         this.searchList()
       },
 			searchTextDel(){

pages_category_page1/goodsModule/userEvaluate.vue

@@ -148,9 +148,13 @@
         evaluateEmpty: false
 			}
 		},
-		onLoad() {
+		onShow(){
+			this.commentVOList = []
 			this.getMyCommentList()
 		},
+		// onLoad() {
+		// 	this.getMyCommentList()
+		// },
 		onReachBottom(){
 			if(this.loadingType == 1){
 				uni.stopPullDownRefresh()
@@ -205,7 +209,7 @@
 					pageSize: this.pageSize,
 					state: this.state
 				}, 'GET').then(res => {
-          uni.hideLoading()
+                 uni.hideLoading()
 					if(res.data.page.list.length == 0){
 						this.loadingType = 1
 						this.page = this.page

pages_category_page1/integral/sign.vue

@@ -9,7 +9,7 @@
         </view>
       </view>
       <view v-if="currentDay == lastDay" class="signState flex-center mar-top-30">
-        <view class="signStateBg flex-items flex-center noSign" @click="test">
+        <view class="signStateBg flex-items flex-center noSign">
           <text class="fs48">已签到</text>
         </view>
       </view>
@@ -182,9 +182,6 @@ export default {
         this.signTips = true
       }).catch(res => {})
     },
-    test() {
-      this.signTips = true
-    },
     // 格式化日期位数
     formatNum(num) {
       return num < 10 ? ('0' + num) : num;

pages_category_page1/orderModule/afterSaleApply.vue

@@ -17,13 +17,17 @@
                     :name='item.skuId'
                     @change="checkboxChange(item)">
                   <view class="order-info-item">
-                    <image :src="item.image" class="product-img"></image>
+                    <image :src="item.image"
+                           class="product-img"></image>
                     <view class="info-box">
-                      <text class="product-name">{{item.productName}}</text>
-                      <view class="product-sku">{{item.value}}</view>
+                      <text class="product-name">{{ item.productName }}</text>
+                      <view class="product-sku">{{ item.value }}</view>
                       <view class="price-sku-box">
-                        <text class="product-price"><text class="fuhao">￥</text>{{item.price}}</text>
-                        <text class="product-num">x {{item.number}}</text>
+                        <text class="product-price">
+                          <text class="fuhao">￥</text>
+                          {{ item.price }}
+                        </text>
+                        <text class="product-num">x {{ item.number }}</text>
                       </view>
                     </view>
                   </view>
@@ -36,20 +40,31 @@
       <view class="afterSale-select-box">
         <view class="selectBtn flex-items flex-sp-between">
           <view class="selectBox">
-            <checkbox-group name="allCheck" @change="changeAll">
+            <checkbox-group name="allCheck"
+                            @change="changeAll">
               <label>
-                <checkbox color="#C5AA7B" :value="allCheck.value" :checked="allCheck.checked"/><text>{{allCheck.name}}</text>
+                <checkbox color="#C5AA7B"
+                          :value="allCheck.value"
+                          :checked="allCheck.checked"/>
+                <text>{{ allCheck.name }}</text>
               </label>
             </checkbox-group>
           </view>
           <view class="selectRight flex-items">
-            <view class="selectNum">{{number || 0}}件商品</view>
-            <view class="totalPrice">合计：<text>￥{{total.toFixed(2)}}</text></view>
+            <view class="selectNum">{{ number || 0 }}件商品</view>
+            <view class="totalPrice">合计：
+              <text>￥{{ total.toFixed(2) }}</text>
+            </view>
           </view>
         </view>
         <view class="afterBtnBox flex-items flex-sp-between">
-          <view class="afterBtn1" @click="ReturnMoney(item)">仅退款</view>
-          <view v-if="distribution !== 1" class="afterBtn2" @click="ReturnGoods(item)">退款退货</view>
+          <view class="afterBtn1"
+                @click="ReturnMoney(item)">仅退款
+          </view>
+          <view v-if="distribution !== 1"
+                class="afterBtn2"
+                @click="ReturnGoods(item)">退款退货
+          </view>
         </view>
       </view>
     </view>
@@ -64,122 +79,162 @@ export default {
     return {
       item: {},
       checkboxChangelist: [],
-      xuanzlist:[],
-      allCheck : {
-        name : '全选',
-        value : 'all',
-        checked : false
+      xuanzlist: [],
+      allCheck: {
+        name: '全选',
+        value: 'all',
+        checked: false
       },
       number: null,
       total: 0,
       distribution: null,
-	  isAllSelect:null,
+      isAllSelect: 0,
+      evaluated: 0,//待评价订单申请
     }
   },
-  onLoad(item) {
-    this.item = JSON.parse(item.item)
+  onLoad(options) {
+    this.item = JSON.parse(options.item)
     this.distribution = this.item.skus[0].distribution
+    this.evaluated = options.isAllSelect
     // this.item.skus.forEach((item) => {
     //   this.number = this.number + item.number
     //   this.total = this.total + item.total
     // })
   },
   methods: {
+    // 算钱
+    HandleGetRefundMoney() {
+      return new Promise((resolve, reject) => {
+        if (this.xuanzlist.length <= 0) {
+          resolve(0)
+          return
+        }
+        uni.showLoading({
+          title: "计算中..."
+        })
+        let postData = {
+          orderId: this.item.orderId,
+          isAllSelect: this.evaluated == 1 ? this.xuanzlist.length === this.item.skus.length ? 1 : 0 : 0,
+          skus: this.xuanzlist
+        }
+        NET.request(API.GetRefundMoney, postData, "POST").then(res => {
+          uni.hideLoading()
+          resolve(parseFloat(res.json))
+        })
+      })
+    },
     // 申请退款
     ReturnMoney(item) {
-      console.log(99999)
-      if(this.xuanzlist.length<=0){
+      if (this.xuanzlist.length <= 0) {
         uni.showToast({
-          title:'请选择退款的商品',
-          duration:2000,
-          icon:'none'
+          title: '请选择退款的商品',
+          duration: 2000,
+          icon: 'none'
         })
-      }else{
-        uni.setStorageSync('afterSaleApplyRefund',this.xuanzlist)
+      } else {
+        uni.setStorageSync('afterSaleApplyRefund', this.xuanzlist)
         uni.navigateTo({
-          url: 'afterSaleApplyRefund?orderId='+this.item.orderId+'&isAllSelect='+this.isAllSelect
+          url: 'afterSaleApplyRefund?orderId=' + this.item.orderId + '&isAllSelect=' + (this.evaluated==1?this.isAllSelect:0)
         })
       }
     },
     // 全选
-    changeAll (e) {
-		console.log(e,'dhjishjkfdjhdfsjhkds')
-      if(e.detail.value.length == 0) {
+    async changeAll(e) {
+      if (e.detail.value.length == 0) {
         this.item.skus.map(item => this.$set(item, 'checked', false));
         this.$set(this.allCheck, 'checked', false);
         this.xuanzlist = []
-		this.isAllSelect = 0
-      }else{
+        if (this.item.state === 4 && this.evaluated != undefined) {
+          this.isAllSelect = this.evaluated
+        } else {
+          this.isAllSelect = 0
+        }
+      } else {
         this.item.skus.map(item => this.$set(item, 'checked', true));
         this.$set(this.allCheck, 'checked', true);
-		this.isAllSelect = 1
+        if (this.item.state === 4 && this.evaluated != undefined) {
+          this.isAllSelect = this.evaluated
+        } else {
+          this.isAllSelect = 1
+        }
         this.xuanzlist = this.item.skus.filter(item => item.checked == true)
-		this.number = 0
-		this.total = 0
-		this.item.skus.forEach((item) => {
-		  this.number = this.number + item.number
-		  this.total = this.total + item.total
-		})
+        this.number = 0
+        // this.total = 0
+        this.item.skus.forEach((item) => {
+          this.number = this.number + item.number
+          // this.total = this.total + item.total
+        })
       }
+      this.total = await this.HandleGetRefundMoney()
     },
     // 申请退货
     ReturnGoods(item) {
-      if(this.xuanzlist.length<=0){
+      if (this.xuanzlist.length <= 0) {
         uni.showToast({
-          title:'请选择退货的商品',
-          duration:2000,
-          icon:'none'
+          title: '请选择退货的商品',
+          duration: 2000,
+          icon: 'none'
         })
-      }else{
+      } else {
         uni.navigateTo({
-          url: 'afterSaleApplyRetund?list=' + encodeURIComponent(JSON.stringify(this.xuanzlist))+'&orderId='+this.item.orderId+'&isAllSelect='+this.isAllSelect
+          url: 'afterSaleApplyRetund?list=' + encodeURIComponent(JSON.stringify(this.xuanzlist)) + '&orderId=' + this.item.orderId + '&isAllSelect='+ (this.evaluated==1?this.isAllSelect:0)
         })
       }
     },
-    checkboxGroupChange(e){
+    checkboxGroupChange(e) {
       // console.log(e, 'fdsfdsfsdf')
     },
-	
-    checkboxChange(e) {
-	  // 动态设置商品件数和总计
-	  if(e.checked){
-		  this.number = this.number + e.number
-		  this.total = this.total + e.total
-	  }else{
-		  this.number = this.number - e.number
-		  this.total = this.total - e.total
-	  }
-	  // 筛选勾选的
+
+    async checkboxChange(e) {
+      // 动态设置商品件数和总计
+      if (e.checked) {
+        this.number = this.number + e.number
+        // this.total = this.total + e.total
+      } else {
+        this.number = this.number - e.number
+        // this.total = this.total - e.total
+      }
+      // 筛选勾选的
       this.xuanzlist = this.item.skus.filter(item => item.checked == true)
-	  
-	  // 是否为全选
-	  if(this.item.skus.length == this.xuanzlist.length){
-		  this.isAllSelect = 1
-		  this.$set(this.allCheck, 'checked', true);
-	  }else{
-		  this.isAllSelect =  0
-		  this.$set(this.allCheck, 'checked', false);
-	  }
-	  console.log(this.isAllSelect,'this.isAllSelect')
-	  
-  //     if(this.xuanzlist.findIndex(item=>item.checked===true)==-1){
-		//   console.log(this.allCheck,'this.allCheck')
-		//   console.log(this.xuanzlist,'this.xuanzlist')
-  //       this.$set(this.allCheck, 'checked', false);
-  //     } else {
-		//   console.log(this.allCheck,'this.allCheck')
-  //       this.$set(this.allCheck, 'checked', true);
-		// console.log(this.xuanzlist,'this.xuanzlist')
-  //     }
+
+      // 是否为全选
+      if (this.item.skus.length == this.xuanzlist.length) {
+        if (this.item.state === 4 && this.evaluated != undefined) {
+          this.isAllSelect = this.evaluated
+        } else {
+          this.isAllSelect = 1
+        }
+        this.$set(this.allCheck, 'checked', true);
+      } else {
+        if (this.item.state === 4 && this.evaluated != undefined) {
+          this.isAllSelect = this.evaluated
+        } else {
+          this.isAllSelect = 0
+        }
+        this.$set(this.allCheck, 'checked', false);
+      }
+      this.total = await this.HandleGetRefundMoney()
+
+      //     if(this.xuanzlist.findIndex(item=>item.checked===true)==-1){
+      //   console.log(this.allCheck,'this.allCheck')
+      //   console.log(this.xuanzlist,'this.xuanzlist')
+      //       this.$set(this.allCheck, 'checked', false);
+      //     } else {
+      //   console.log(this.allCheck,'this.allCheck')
+      //       this.$set(this.allCheck, 'checked', true);
+      // console.log(this.xuanzlist,'this.xuanzlist')
+      //     }
     }
   }
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss"
+       scoped>
 page {
   background: #F8F8F8;
 }
+
 .order-list-box {
   padding: 20upx 30upx;
   box-sizing: border-box;
@@ -315,8 +370,10 @@ page {
   box-sizing: border-box;
   height: 240rpx;
 }
+
 .afterBtnBox {
   margin-top: 30rpx;
+
   .afterBtn1 {
     width: 342rpx;
     line-height: 100rpx;
@@ -325,6 +382,7 @@ page {
     color: #333333;
     margin-right: 30rpx;
   }
+
   .afterBtn2 {
     width: 342rpx;
     height: 100rpx;
@@ -335,6 +393,7 @@ page {
     color: #FFEBC4;
   }
 }
+
 .selectBox /deep/ .uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
   border-color: #C5AA7B;
 }

pages_category_page1/orderModule/afterSaleApplyRefund.vue

@@ -190,30 +190,59 @@ export default {
     this.isIphone = getApp().globalData.isIphone;
     this.fileList = this.$refs.uUpload.lists
   },
-  onLoad(options) {
+  async onLoad(options) {
 	  console.log(options,'options')
     if (uni.getStorageSync('applyItem')) {
       this.afterRefund = uni.getStorageSync('applyItem')
       this.list.push(this.afterRefund)
     } else if (uni.getStorageSync('afterSaleApplyRefund')) {
       this.list = uni.getStorageSync('afterSaleApplyRefund')
-      console.log(this.list, 'list')
     }
+	console.log(this.list,'this.list')
     this.orderId = parseInt(options.orderId)
 	this.isAllSelect = options.isAllSelect
+	console.log(this.isAllSelect,'this.isAllSelect')
     const res = uni.getStorageSync('storage_key');
     this.headerToken.Authorization = res.token
-    console.log(this.list, 'list')
     this.list.forEach(el => {
-      this.sellPriceitem = this.sellPriceitem + (el.number*el.price) + el.logisticsPrice
+		if(this.isAllSelect > 0){
+			this.sellPriceitem = this.sellPriceitem + (el.number*el.price) + el.logisticsPrice
+		}else{
+			this.sellPriceitem = this.sellPriceitem + (el.number*el.price)
+		}
+
     })
     // this.sellPriceitem = options.sellPriceitem
     // this.sellPriceitem = options.sellPriceitem
     this.getReasonEnums()
     uni.removeStorageSync('applyItem')
     uni.removeStorageSync('afterSaleApplyRefund')
+    this.sellPriceitem=await this.HandleGetRefundMoney()
   },
   methods: {
+    // 算钱
+    HandleGetRefundMoney() {
+      return new Promise((resolve, reject) => {
+        uni.showLoading({
+          title: "计算中..."
+        })
+        let postData = {
+          orderId: this.orderId,
+          isAllSelect: this.isAllSelect==1 ? 1 : 0,
+          skus: this.list,
+          afterType:2,
+          goodsState:this.ReturnMoneyQuery.goodsState
+        }
+        NET.request(API.GetRefundMoney, postData, "POST").then(res => {
+          uni.hideLoading()
+          resolve (parseFloat(res.json))
+        }).catch(err=>{
+          uni.hideLoading()
+        })
+      })
+    },
+
+
     confirmTap() {
       console.log(this.fileList, 'commentImgs')
       if(this.fileList.length>0){
@@ -306,8 +335,10 @@ export default {
     openReasonSelect() {
       this.reasonShowFalg = true
     },
-    closeStatusSelect() {
+    async closeStatusSelect() {
       this.cargoStatusShowFalg = false
+      this.sellPriceitem=await this.HandleGetRefundMoney()
+
     },
     closeAfterSelect() {
       this.refundTypeShow = false

pages_category_page1/orderModule/afterSaleApplyRetund.vue

@@ -1,18 +1,25 @@
 <template>
   <view class="container">
-    <view class="content" style="padding-bottom:200upx;">
-      <view class="order-list-box" v-for="(item,index) in retundlist" :key="index">
+    <view class="content"
+          style="padding-bottom:200upx;">
+      <view class="order-list-box"
+            v-for="(item,index) in retundlist"
+            :key="index">
         <view class="item">
           <view class="order-info-box">
             <view class="order-info">
               <view class="order-info-item">
-                <image :src="item.image" class="product-img"></image>
+                <image :src="item.image"
+                       class="product-img"></image>
                 <view class="info-box">
-                  <text class="product-name">{{item.productName}}</text>
-                  <view class="product-sku">{{item.value}}</view>
+                  <text class="product-name">{{ item.productName }}</text>
+                  <view class="product-sku">{{ item.value }}</view>
                   <view class="price-sku-box">
-                    <text class="product-price"><text class="fuhao">￥</text>{{item.price}}</text>
-                    <text class="product-num">x {{item.number}}</text>
+                    <text class="product-price">
+                      <text class="fuhao">￥</text>
+                      {{ item.price }}
+                    </text>
+                    <text class="product-num">x {{ item.number }}</text>
                   </view>
                 </view>
               </view>
@@ -22,22 +29,31 @@
       </view>
 
       <view class="afterSale-select-box">
-        <view class="item" @click="openStatusSelect">
+        <view class="item"
+              @click="openStatusSelect">
           <view class="l">货物状态</view>
-          <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 0">
+          <view class="r-box"
+                v-model="ReturnMoneyQuery.goodsState"
+                v-if="ReturnMoneyQuery.goodsState == 0">
             <text>未收到货</text>
-            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png"
+                   class="r"></image>
           </view>
-          <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 1">
+          <view class="r-box"
+                v-model="ReturnMoneyQuery.goodsState"
+                v-if="ReturnMoneyQuery.goodsState == 1">
             <text>已收到货</text>
-            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png"
+                   class="r"></image>
           </view>
         </view>
-        <view class="item" @click="openReasonSelect">
+        <view class="item"
+              @click="openReasonSelect">
           <view class="l">退款原因</view>
           <view class="r-box">
-            <text v-model="ReturnMoneyQuery.returnReason">{{liyoutext}}</text>
-            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
+            <text v-model="ReturnMoneyQuery.returnReason">{{ liyoutext }}</text>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png"
+                   class="r"></image>
           </view>
         </view>
       </view>
@@ -45,13 +61,16 @@
       <view class="afterSale-select-box mt20">
         <view class="item">
           <view class="l">退款金额：
-            <text class="order-status">¥ {{sellPriceitem.toFixed(2)}}</text>
+            <text class="order-status">¥ {{ sellPriceitem.toFixed(2) }}</text>
           </view>
         </view>
         <view class="item item-start">
           <view class="l">退款说明：</view>
           <view class="r-box r-box2">
-            <input v-model="ReturnMoneyQuery.returnDesc" type="text" placeholder="选填" class="r-box-input"></input>
+            <input v-model="ReturnMoneyQuery.returnDesc"
+                   type="text"
+                   placeholder="选填"
+                   class="r-box-input"></input>
           </view>
         </view>
       </view>
@@ -59,7 +78,12 @@
       <view class="afterSale-select-box mt20">
         <view class="upload-title">上传凭证</view>
         <view class="mar-left-10 mar-top-10">
-          <u-upload :limitType="['png', 'jpg', 'jpeg', 'webp', 'gif', 'image']" max-count="4" :action="action" ref="uUpload" :header="headerToken" :form-data="formData"></u-upload>
+          <u-upload :limitType="['png', 'jpg', 'jpeg', 'webp', 'gif', 'image']"
+                    max-count="4"
+                    :action="action"
+                    ref="uUpload"
+                    :header="headerToken"
+                    :form-data="formData"></u-upload>
         </view>
       </view>
 
@@ -74,45 +98,85 @@
       </view>
     </view>
 
-    <view class="order-confirm-box" style="padding-top:30upx;" :style="{'padding-bottom':(isIphone==true? 90:0)+'rpx'}">
-      <text class="btn" @click="confirmTap">提交</text>
+    <view class="order-confirm-box"
+          style="padding-top:30upx;"
+          :style="{'padding-bottom':(isIphone==true? 90:0)+'rpx'}">
+      <text class="btn"
+            @click="confirmTap">提交
+      </text>
     </view>
 
     <!-- 货物状态弹框 -->
-    <u-popup v-model="cargoStatusShowFalg" mode="center" border-radius="14" width="80%" closeable="true">
+    <u-popup v-model="cargoStatusShowFalg"
+             mode="center"
+             border-radius="14"
+             width="80%"
+             closeable="true">
       <view class="alert-box">
         <view class="afterSale-status-box">
           <view class="status-title">货物状态</view>
           <view class="item-box">
-            <view class="item" @click="ReturnMoneyQuery.goodsState = 0">
+            <view class="item"
+                  @click="ReturnMoneyQuery.goodsState = 0">
               <text class="status-select-title">未收到货</text>
-              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 0" class="status-select-img"></image>
-              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill"
+                     src="https://ceres.zkthink.com/static/images/selectActive.png"
+                     v-if="ReturnMoneyQuery.goodsState == 0"
+                     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="ReturnMoneyQuery.goodsState = 1">
+            <view class="item"
+                  @click="ReturnMoneyQuery.goodsState = 1">
               <text class="status-select-title">已收到货</text>
-              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 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>
+              <image mode="aspectFill"
+                     src="https://ceres.zkthink.com/static/images/selectActive.png"
+                     v-if="ReturnMoneyQuery.goodsState == 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>
-          <view class="status-btn" @click="closeStatusSelect">确定</view>
+          <view class="status-btn"
+                @click="closeStatusSelect">确定
+          </view>
         </view>
       </view>
     </u-popup>
     <!-- 退款原因弹框 -->
     <!-- 退款原因弹框 -->
-    <u-popup v-model="reasonShowFalg" mode="center" border-radius="14" width="80%" closeable="true">
+    <u-popup v-model="reasonShowFalg"
+             mode="center"
+             border-radius="14"
+             width="80%"
+             closeable="true">
       <view class="alert-box">
-        <view class="afterSale-status-box" scroll-y>
+        <view class="afterSale-status-box"
+              scroll-y>
           <view class="status-title">退款原因</view>
           <view class="item-box">
-            <view class="item" @click="returnReasonTap(item,index)" v-for="(item,index) in liyouData" :key="index">
-              <text class="status-select-title">{{item}}</text>
-              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.returnReason == index" 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 class="item"
+                  @click="returnReasonTap(item,index)"
+                  v-for="(item,index) in liyouData"
+                  :key="index">
+              <text class="status-select-title">{{ item }}</text>
+              <image mode="aspectFill"
+                     src="https://ceres.zkthink.com/static/images/selectActive.png"
+                     v-if="ReturnMoneyQuery.returnReason == index"
+                     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="closeReasonSelect">确定</view>
+          <view class="status-btn"
+                @click="closeReasonSelect">确定
+          </view>
         </view>
       </view>
     </u-popup>
@@ -140,54 +204,77 @@ export default {
         returnReason: 0,
         returnType: 0
       },
-      action:API.UploadUrl,
-      formData:{'folderId': -1},
-      headerToken:{Authorization:''},
-      fileList:[],
-      sellPriceitem: 0 ,//退款价格
+      action: API.UploadUrl,
+      formData: {'folderId': -1},
+      headerToken: {Authorization: ''},
+      fileList: [],
+      sellPriceitem: 0,//退款价格
       listitemid: '',	//选中商品的id
-      orderCode:'',	// 选中订单编码
+      orderCode: '',	// 选中订单编码
 
-      liyouData:[],
-      liyoutext:'',
-      liyouindex:'',
-      retundlist:[],
-      orderId:0,
+      liyouData: [],
+      liyoutext: '',
+      liyouindex: '',
+      retundlist: [],
+      orderId: 0,
       isIphone: false,
-	  isAllSelect: 0,
+      isAllSelect: 0,
     }
   },
   onReady() {
     this.isIphone = getApp().globalData.isIphone;
-    console.log(this.isIphone)
     this.fileList = this.$refs.uUpload.lists
   },
-  onLoad(option) {
-	  console.log(option,'option')
+  async onLoad(option) {
     this.retundlist = JSON.parse(decodeURIComponent(option.list))
+    console.log(option,'this.retundlist')
+
     this.orderId = option.orderId
-	this.isAllSelect = option.isAllSelect
+    this.isAllSelect = option.isAllSelect
     // console.log(this.retundlist, 'retundlist')
-    this.retundlist.forEach(el =>{
-      this.sellPriceitem = this.sellPriceitem + el.number*el.price
+    this.retundlist.forEach(el => {
+      this.sellPriceitem = this.sellPriceitem + el.number * el.price
     })
     this.getReasonEnums()
+    this.sellPriceitem = await this.HandleGetRefundMoney()
   },
   methods: {
+    // 算钱
+    HandleGetRefundMoney() {
+      return new Promise((resolve, reject) => {
+        uni.showLoading({
+          title: "计算中..."
+        })
+        let postData = {
+          orderId: this.orderId,
+          isAllSelect: this.isAllSelect==1 ? 1 : 0,
+          skus: this.retundlist,
+          afterType:2,
+          goodsState:this.ReturnMoneyQuery.goodsState
+        }
+        NET.request(API.GetRefundMoney, postData, "POST").then(res => {
+          uni.hideLoading()
+          resolve (parseFloat(res.json))
+        }).catch(err=>{
+          uni.hideLoading()
+        })
+      })
+    },
     confirmTap() {
-      if(this.fileList.length>0){
+      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+','
+        for (let i = 0; i < this.fileList.length; i++) {
+          this.commentImgs += this.fileList[i].response.data.url + ','
         }
       }
       this.ReturnMoney()
     },
-    getReasonEnums(){
+    getReasonEnums() {
       NET.request(API.ReasonEnums, 'GET').then(res => {
         this.liyouData = res.data
         this.liyoutext = this.liyouData[0]
-      }).catch(res => {})
+      }).catch(res => {
+      })
     },
     ReturnMoney() {
       if (this.ReturnMoneyQuery.goodsState === '') {
@@ -208,22 +295,22 @@ export default {
           title: '正在提交...',
         })
         let skusobjdata = []
-		this.retundlist.forEach((i) => {
-			let skusobj = {}
-			skusobj["skuId"] = i.skuId
-			skusobj["number"] = i.number
-			skusobjdata.push(skusobj)
-		})
+        this.retundlist.forEach((i) => {
+          let skusobj = {}
+          skusobj["skuId"] = i.skuId
+          skusobj["number"] = i.number
+          skusobjdata.push(skusobj)
+        })
         NET.request(API.ApplyReturnMoney, {
-          orderId:this.orderId,
-          afterType:2,
-          goodsState:this.ReturnMoneyQuery.goodsState,
+          orderId: this.orderId,
+          afterType: 2,
+          goodsState: this.ReturnMoneyQuery.goodsState,
           price: this.sellPriceitem,
           returnReason: this.liyoutext,
           explain: this.ReturnMoneyQuery.returnDesc,
           image: this.commentImgs,
           skus: skusobjdata,
-		  isAllSelect: this.isAllSelect
+          isAllSelect: this.isAllSelect
         }, 'POST').then(res => {
           uni.hideLoading()
           uni.showToast({
@@ -243,7 +330,7 @@ export default {
       }
     },
     // 理由
-    returnReasonTap(item,index){
+    returnReasonTap(item, index) {
       this.ReturnMoneyQuery.returnReason = index
       this.liyoutext = item
     },
@@ -254,8 +341,9 @@ export default {
     openReasonSelect() {
       this.reasonShowFalg = true
     },
-    closeStatusSelect() {
+    async closeStatusSelect() {
       this.cargoStatusShowFalg = false
+      this.sellPriceitem = await this.HandleGetRefundMoney()
     },
     closeReasonSelect() {
       this.reasonShowFalg = false

pages_category_page1/orderModule/index.vue

@@ -1,153 +1,238 @@
 <!-- 订单中心 -->
 <template>
-	<view class="container">
-		<view style="padding-bottom:68upx;">
-			<view>
-				<u-tabs :list="tabList" :is-scroll="false" active-color="#C5AA7B !important" :current="type"
-					@change="orderStateChange"></u-tabs>
-			</view>
-			<view class="order-list-box">
-				<view>
-					<view class="item" v-if="item.skus[0].ifAdd!==1"  v-for="(item, index) in list" :key="index" @click="itemTap(item.orderId,item)">
-						<view class="order-list-top">
-							<view class="top-l" @click.stop="goShop(item.shopId)">
-								<image :src="item.shopLogo" class="shop-img"></image>
-								<text class="shop-name">{{item.shopName}}</text>
-								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img"></image>
-							</view>
-							<!--订单状态： 退款中 交易关闭 待付款 待发货 待收货 已完成-->
-							<view class="order-status" v-if='item.state==1'>待付款</view>
-							<view class="order-status" v-else-if='item.state==2'>待发货</view>
-							<view class="order-status" v-else-if='item.state==3'>待收货</view>
-							<view class="order-status" v-else-if='item.state==4'>已完成</view>
-							<view class="order-status" v-else-if='item.state==5'>交易关闭</view>
-							<view class="order-status" v-else-if='item.state==6'>待成团</view>
-							<view class="order-status" v-else-if='item.returnType==1'>退款中</view>
-						</view>
-						<view class="order-info-box">
-							<view class="order-info">
-								<view class="order-info-item" v-for="(proItem, pIndex) in item.skus" :key="pIndex">
-									<image :src="proItem.image" class="product-img"></image>
-									<view class="info-box">
-										<text class="product-name">{{proItem.productName}}</text>
-										<view class="product-sku">{{proItem.value}}</view>
-										<view class="price-sku-box">
-											<view class="box-h flex-items-plus">
-												<text class="product-price"><text
-														class="fuhao">￥</text>{{proItem.price}}</text>
-												<text class="product-num">x {{proItem.number}}</text>
-											</view>
-											<view v-if="proItem.commentId == 0 && item.state == 4" class="evaluate"
-												@click.stop="evaluateTap(proItem,item.orderId)">立即评价</view>
-											<view v-if="proItem.commentId != 0 && item.state == 4" class="evaluate2"
-												@click.stop="evaluateTowTap(index,proItem.commentId)">追加评价</view>
-										</view>
-									</view>
-								</view>
-								<view class="total-price-box">总价¥{{(item.orderPrice + item.logisticsPrice).toFixed(2)}},优惠¥{{item.discountPrice}}
-									<block v-if="item.price > 0">
-										，实付¥{{item.price}}
-									</block>
-								</view>
-							</view>
-							<view class="btnBox flex-items" :class="{flexSpBetween: item.state==5 || item.state == 9}">
-								<view class="delIcon" v-if='item.state==5 || item.state == 9'
-									@click.stop="delOrder(item.orderId)"></view>
-								<view class="order-btn-box">
-									<text class="btn l" v-if='item.state==1|| item.state == 6'
-										@click.stop="cancelOrder(item.orderId,index)">取消订单</text>
-									<!-- <text class="btn l" v-if='item.state==2' >提醒发货</text> -->
-									<text class="btn r" v-if='item.state==1'
-										@click.stop="payOrder(item,index)">立即付款</text>
-									<text class="btn l"
-										v-if="(item.state==3 || item.state==4) && ( item.afterState == 0 || item.afterState == 6)"
-										@click.stop="applyTap(item,index)">申请售后</text>
-									<text class="btn l" v-if='item.state==3 || item.state==4'
-										@click.stop="goLogisticsTap(item.express,item.deliverFormid)">查看物流</text>
-									<text class="btn r" v-if='item.state==3'
-										@click.stop="confirmReceiptTap(item.orderId)">确认收货</text>
-									<text class="btn l" v-if='item.returnType==1'
-										@click.stop="refundDetail(item)">退款详情</text>
-									<text class="btn r" v-if='item.state==6'
-										@click.stop="goInviteSpll(item.collageId,item.orderId,item.skus[0].productId,item.skus[0].skuId,item.shopGroupWorkId)">邀请拼单</text>
-									<text class="btn r" v-if='item.state==5'
-										@click.stop="againCollage(item.skus[0].productId,item.shopId,item.skus[0].skuId)">{{item.collageId !=0 ? '再次开团' : '再次购买'}}</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-					<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/emptyOrderImg.png"></image>
-					<label class="font-color-999 fs26 mar-top-30">你还没有订单哦～</label>
-				</view>
-			</view>
-		</view>
-		<u-popup class="pay-type-popup" v-model="showPayTypePopup" mode="bottom" border-radius="14"
-			close-icon-pos="top-right" close-icon-size="20">
-			<view class="pay-type-item">
-				<radio-group @change="payTypeChange" v-model="paymentMode">
-					<view class="pay-type-radio">
-						<view class="pay-type-img">
-							<img class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/alipay.png" />
-						</view>
-						<label class="pay-type-label">支付宝支付</label>
-						<radio class="pay-type-radio-item" style="transform:scale(0.7)" :checked="paymentMode == 2"
-							value="2" />
-					</view>
-					<view class="pay-type-radio">
-						<view class="pay-type-img">
-							<img class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/huabei.png" />
-						</view>
-						<label class="pay-type-label">花呗分期</label>
-						<radio class="pay-type-radio-item" style="transform:scale(0.7)" :disabled="totalPrice < 0.03"
-							:checked="paymentMode == 3" value="3" />
-					</view>
-				</radio-group>
-				<view class="huabei-detail">
-					<radio-group @change="huabeiPeriodChange" v-model="huabeiPeriod">
-						<view class="period-radio">
-							<view class="period-amount">
-								<label class="period-each">￥ {{fenqiFeeList[0]|clip2Decimal}}x3期</label>
-								<label class="period-each-charge">手续费￥{{chargeFeeList[0]|clip2Decimal}}/期</label>
-							</view>
-							<radio class="period-type-radio-item" style="transform:scale(0.7)"
-								:disabled="fenqiDisabledList[0]" :checked="huabeiPeriod == 3" value="3" />
-						</view>
-						<view class="period-radio">
-							<view class="period-amount">
-								<label class="period-each">￥ {{fenqiFeeList[1]|clip2Decimal}}x6期</label>
-								<label class="period-each-charge">手续费￥{{chargeFeeList[1]|clip2Decimal}}/期</label>
-							</view>
-							<radio class="period-type-radio-item" style="transform:scale(0.7)"
-								:disabled="fenqiDisabledList[1]" :checked="huabeiPeriod == 6" value="6" />
-						</view>
-						<view class="period-radio">
-							<view class="period-amount">
-								<label class="period-each">￥ {{fenqiFeeList[2]|clip2Decimal}}x12期</label>
-								<label class="period-each-charge">手续费￥{{chargeFeeList[2]|clip2Decimal}}/期</label>
-							</view>
-							<radio class="period-type-radio-item" style="transform:scale(0.7)"
-								:disabled="fenqiDisabledList[2]" :checked="huabeiPeriod == 12" value="12" />
-						</view>
-					</radio-group>
-				</view>
-			</view>
-			<view class="paytype-confirm">
-				<view class="fenqi-total-amount" v-if="totalPrice >= 0.03 && paymentMode == 3">
-					<label class="fenqi-all">分期总额 ￥{{ totalPrice|clip2Decimal }}</label>
-					<label class="charge-fee-all">手续费 ￥{{ chargeFee|clip2Decimal }}</label>
-				</view>
-				<view class="fenqi-total-amount" v-if="paymentMode == 2">
-					<label class="order-amount">订单总额 ￥{{ totalPrice|clip2Decimal }}</label>
-				</view>
-				<view class="fenqi-confirm">
-					<text class="btn active" @click="continuePay">确认</text>
-				</view>
-			</view>
-		</u-popup>
+  <view class="container">
+    <view style="padding-bottom:68upx;">
+      <view>
+        <u-tabs :list="tabList"
+                :is-scroll="false"
+                active-color="#C5AA7B !important"
+                :current="type"
+                @change="orderStateChange"></u-tabs>
+      </view>
+      <view class="order-list-box">
+        <view>
+          <view class="item"
+                v-if="item.skus[0].ifAdd!==1"
+                v-for="(item, index) in list"
+                :key="index"
+                @click="itemTap(item.orderId,item)">
+            <view class="order-list-top">
+              <view class="top-l"
+                    @click.stop="goShop(item.shopId)">
+                <image :src="item.shopLogo"
+                       class="shop-img"></image>
+                <text class="shop-name">{{ item.shopName }}</text>
+                <image src="https://ceres.zkthink.com/static/images/arrowRight.png"
+                       class="arrow-img"></image>
+              </view>
+              <!--订单状态： 退款中 交易关闭 待付款 待发货 待收货 已完成-->
+              <view class="order-status"
+                    v-if='item.state==1'>待付款
+              </view>
+              <view class="order-status"
+                    v-else-if='item.state==2'>待发货
+              </view>
+              <view class="order-status"
+                    v-else-if='item.state==3'>待收货
+              </view>
+              <view class="order-status"
+                    v-else-if='item.state==4'>已完成
+              </view>
+              <view class="order-status"
+                    v-else-if='item.state==5'>交易关闭
+              </view>
+              <view class="order-status"
+                    v-else-if='item.state==6'>待成团
+              </view>
+              <view class="order-status"
+                    v-else-if='item.returnType==1'>退款中
+              </view>
+            </view>
+            <view class="order-info-box">
+              <view class="order-info">
+                <view class="order-info-item"
+                      v-for="(proItem, pIndex) in item.skus"
+                      :key="pIndex">
+                  <image :src="proItem.image"
+                         class="product-img"></image>
+                  <view class="info-box">
+                    <text class="product-name">{{ proItem.productName }}</text>
+                    <view class="product-sku">{{ proItem.value }}</view>
+                    <view class="price-sku-box">
+                      <view class="box-h flex-items-plus">
+                        <text class="product-price">
+                          <text
+                              class="fuhao">￥
+                          </text>
+                          {{ proItem.price }}
+                        </text>
+                        <text class="product-num">x {{ proItem.number }}</text>
+                      </view>
+                      <view v-if="proItem.commentId == 0 && item.state == 4"
+                            class="evaluate"
+                            @click.stop="evaluateTap(proItem,item.orderId)">立即评价
+                      </view>
+                      <view v-if="proItem.commentId != 0 && item.state == 4"
+                            class="evaluate2"
+                            @click.stop="evaluateTowTap(index,proItem.commentId)">追加评价
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <view class="total-price-box">
+                  总价¥{{ (item.orderPrice + item.logisticsPrice).toFixed(2) }},优惠¥{{ item.discountPrice }}
+                  <block v-if="item.price > 0">
+                    ，实付¥{{ item.price }}
+                  </block>
+                </view>
+              </view>
+              <view class="btnBox flex-items"
+                    :class="{flexSpBetween: item.state==5 || item.state == 9}">
+                <view class="delIcon"
+                      v-if='item.state==5 || item.state == 9'
+                      @click.stop="delOrder(item.orderId)"></view>
+                <view class="order-btn-box">
+                  <text class="btn l"
+                        v-if='item.state==1|| item.state == 6'
+                        @click.stop="cancelOrder(item.orderId,index)">取消订单
+                  </text>
+                  <!-- <text class="btn l" v-if='item.state==2' >提醒发货</text> -->
+                  <text class="btn r"
+                        v-if='item.state==1'
+                        @click.stop="payOrder(item,index)">立即付款
+                  </text>
+                  <text class="btn l"
+                        v-if="(item.state==3 || item.state==4) && ( item.afterState == 0 || item.afterState == 6)"
+                        @click.stop="applyTap(item,index)">申请售后
+                  </text>
+                  <text class="btn l"
+                        v-if='item.state==3 || item.state==4'
+                        @click.stop="goLogisticsTap(item.express,item.deliverFormid)">查看物流
+                  </text>
+                  <text class="btn r"
+                        v-if='item.state==3'
+                        @click.stop="confirmReceiptTap(item.orderId)">确认收货
+                  </text>
+                  <text class="btn l"
+                        v-if='item.returnType==1'
+                        @click.stop="refundDetail(item)">退款详情
+                  </text>
+                  <text class="btn r"
+                        v-if='item.state==6'
+                        @click.stop="goInviteSpll(item.collageId,item.orderId,item.skus[0].productId,item.skus[0].skuId,item.shopGroupWorkId)">
+                    邀请拼单
+                  </text>
+                  <text class="btn r"
+                        v-if='item.state==5'
+                        @click.stop="againCollage(item.skus[0].productId,item.shopId,item.skus[0].skuId)">
+                    {{ item.collageId != 0 ? '再次开团' : '再次购买' }}
+                  </text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-if="ifEmpty"
+              class="emptyOrder-box flex-items-plus flex-column">
+          <image class="emptyOrder-img"
+                 src="https://ceres.zkthink.com/static/images/emptyOrderImg.png"></image>
+          <label class="font-color-999 fs26 mar-top-30">你还没有订单哦～</label>
+        </view>
+      </view>
+    </view>
+    <u-popup class="pay-type-popup"
+             v-model="showPayTypePopup"
+             mode="bottom"
+             border-radius="14"
+             close-icon-pos="top-right"
+             close-icon-size="20">
+      <view class="pay-type-item">
+        <radio-group @change="payTypeChange"
+                     v-model="paymentMode">
+          <view class="pay-type-radio">
+            <view class="pay-type-img">
+              <img class="pay-type-img-inner"
+                   src="https://ceres.zkthink.com/static/images/alipay.png"/>
+            </view>
+            <label class="pay-type-label">支付宝支付</label>
+            <radio class="pay-type-radio-item"
+                   style="transform:scale(0.7)"
+                   :checked="paymentMode == 2"
+                   value="2"/>
+          </view>
+          <view class="pay-type-radio">
+            <view class="pay-type-img">
+              <img class="pay-type-img-inner"
+                   src="https://ceres.zkthink.com/static/images/huabei.png"/>
+            </view>
+            <label class="pay-type-label">花呗分期</label>
+            <radio class="pay-type-radio-item"
+                   style="transform:scale(0.7)"
+                   :disabled="totalPrice < 0.03"
+                   :checked="paymentMode == 3"
+                   value="3"/>
+          </view>
+        </radio-group>
+        <view class="huabei-detail">
+          <radio-group @change="huabeiPeriodChange"
+                       v-model="huabeiPeriod">
+            <view class="period-radio">
+              <view class="period-amount">
+                <label class="period-each">￥ {{ fenqiFeeList[0]|clip2Decimal }}x3期</label>
+                <label class="period-each-charge">手续费￥{{ chargeFeeList[0]|clip2Decimal }}/期</label>
+              </view>
+              <radio class="period-type-radio-item"
+                     style="transform:scale(0.7)"
+                     :disabled="fenqiDisabledList[0]"
+                     :checked="huabeiPeriod == 3"
+                     value="3"/>
+            </view>
+            <view class="period-radio">
+              <view class="period-amount">
+                <label class="period-each">￥ {{ fenqiFeeList[1]|clip2Decimal }}x6期</label>
+                <label class="period-each-charge">手续费￥{{ chargeFeeList[1]|clip2Decimal }}/期</label>
+              </view>
+              <radio class="period-type-radio-item"
+                     style="transform:scale(0.7)"
+                     :disabled="fenqiDisabledList[1]"
+                     :checked="huabeiPeriod == 6"
+                     value="6"/>
+            </view>
+            <view class="period-radio">
+              <view class="period-amount">
+                <label class="period-each">￥ {{ fenqiFeeList[2]|clip2Decimal }}x12期</label>
+                <label class="period-each-charge">手续费￥{{ chargeFeeList[2]|clip2Decimal }}/期</label>
+              </view>
+              <radio class="period-type-radio-item"
+                     style="transform:scale(0.7)"
+                     :disabled="fenqiDisabledList[2]"
+                     :checked="huabeiPeriod == 12"
+                     value="12"/>
+            </view>
+          </radio-group>
+        </view>
+      </view>
+      <view class="paytype-confirm">
+        <view class="fenqi-total-amount"
+              v-if="totalPrice >= 0.03 && paymentMode == 3">
+          <label class="fenqi-all">分期总额 ￥{{ totalPrice|clip2Decimal }}</label>
+          <label class="charge-fee-all">手续费 ￥{{ chargeFee|clip2Decimal }}</label>
+        </view>
+        <view class="fenqi-total-amount"
+              v-if="paymentMode == 2">
+          <label class="order-amount">订单总额 ￥{{ totalPrice|clip2Decimal }}</label>
+        </view>
+        <view class="fenqi-confirm">
+          <text class="btn active"
+                @click="continuePay">确认
+          </text>
+        </view>
+      </view>
+    </u-popup>
     <!-- 取消订单 -->
-    <tui-modal :show="closeTips" :custom="true" :fadein="true">
+    <tui-modal :show="closeTips"
+               :custom="true"
+               :fadein="true">
       <view class="Put-box1">
         <view class="text-align fs34 fs-bold">
           温馨提示
@@ -156,311 +241,314 @@
           您确定要取消该订单吗？
         </view>
         <view class="flex-display flex-sp-between">
-          <view class="btn" @click="closeTips = false">
+          <view class="btn"
+                @click="closeTips = false">
             点错了
           </view>
-          <view class="btn submit" @click="doCancel">
+          <view class="btn submit"
+                @click="doCancel">
             确定取消
           </view>
         </view>
       </view>
     </tui-modal>
-	</view>
+  </view>
 </template>
 
 <script>
-  import tuiModal from "@/components/modal/modal";
-	const NET = require('../../utils/request')
-	const API = require('../../config/api')
-	// #ifdef H5
-	var jweixin = require('jweixin-module')
-	// #endif
-	export default {
-    components: {
-      tuiModal
+import tuiModal from "@/components/modal/modal";
+
+const NET = require('../../utils/request')
+const API = require('../../config/api')
+// #ifdef H5
+var jweixin = require('jweixin-module')
+// #endif
+export default {
+  components: {
+    tuiModal
+  },
+  data() {
+    return {
+      type: 0,
+      page: 1,
+      pageSize: 20,
+      list: [],
+      scrollLeft: 0,
+      tabList: [{
+        name: '全部',
+        number: 0
+      }, {
+        name: '待付款',
+        number: 1
+      }, {
+        name: '待发货',
+        number: 2
+      }, {
+        name: '待收货',
+        number: 3
+      }, {
+        name: '待评价',
+        number: 4
+      }, {
+        name: '待成团',
+        number: 6
+      },],
+      listTotal: 0,
+      loadingType: 0,
+      orderState: '',
+      paymentMode: 2,
+      showPayTypePopup: false,
+      chargeFee: 0,
+      totalPrice: 0,
+      huabeiPeriod: -1,
+      fenqiFeeList: [0, 0, 0],
+      chargeFeeList: [0, 0, 0],
+      fenqiDisabledList: [true, true, true],
+      huabeiChargeType: 1,
+      huabeiFeeRateList: [0, 0, 0],
+      alipayInfo: {},
+      ifEmpty: false,
+      closeTips: false,
+      currentOrderId: null,
+      currentIndex: null
+    }
+  },
+  onLoad(options) {
+    if (options.type) {
+      this.type = options.type,
+          this.orderState = options.type
+      this.getListData()
+    } else {
+      this.getListData()
+    }
+    this.getHuabeiFeeRateList()
+  },
+  onReachBottom() {
+    if (this.loadingType == 1) {
+      uni.stopPullDownRefresh()
+    } else {
+      this.page = this.page + 1
+      this.getListData()
+    }
+  },
+  onBackPress(e) {
+    if (e && e.from === 'navigateBack') {
+      return false;
+    }
+    this.back();
+    return true;
+  },
+  methods: {
+    //去商品详情
+    againCollage(productId, shopId, skuId) {
+      uni.navigateTo({
+        url: '../goodsModule/goodsDetails?productId=' + productId + '&shopId=' + shopId + '&skuId=' +
+            skuId
+      })
     },
-		data() {
-			return {
-				type: 0,
-				page: 1,
-				pageSize: 20,
-				list: [],
-				scrollLeft: 0,
-				tabList: [{
-					name: '全部',
-					number: 0
-				}, {
-					name: '待付款',
-					number: 1
-				}, {
-					name: '待发货',
-					number: 2
-				}, {
-					name: '待收货',
-					number: 3
-				}, {
-					name: '待评价',
-					number: 4
-				}, {
-					name: '待成团',
-					number: 6
-				}, ],
-				listTotal: 0,
-				loadingType: 0,
-				orderState: '',
-				paymentMode: 2,
-				showPayTypePopup: false,
-				chargeFee: 0,
-				totalPrice: 0,
-				huabeiPeriod: -1,
-				fenqiFeeList: [0, 0, 0],
-				chargeFeeList: [0, 0, 0],
-				fenqiDisabledList: [true, true, true],
-				huabeiChargeType: 1,
-				huabeiFeeRateList: [0, 0, 0],
-				alipayInfo: {},
-        ifEmpty: false,
-        closeTips: false,
-        currentOrderId: null,
-        currentIndex: null
-			}
-		},
-		onLoad(options) {
-			if (options.type) {
-				this.type = options.type,
-					this.orderState = options.type
-				this.getListData()
-			} else {
-				this.getListData()
-			}
-			this.getHuabeiFeeRateList()
-		},
-		onReachBottom() {
-			if (this.loadingType == 1) {
-				uni.stopPullDownRefresh()
-			} else {
-				this.page = this.page + 1
-				this.getListData()
-			}
-		},
-		onBackPress(e) {
-			if (e && e.from === 'navigateBack') {
-				return false;
-			}
-			this.back();
-			return true;
-		},
-		methods: {
-			//去商品详情
-			againCollage(productId, shopId, skuId) {
-				uni.navigateTo({
-					url: '../goodsModule/goodsDetails?productId=' + productId + '&shopId=' + shopId + '&skuId=' +
-						skuId
-				})
-			},
-			goInviteSpll(collageId, orderId, productId, skuId, shopGroupWorkId) {
-				uni.navigateTo({
-					url: '../goodsModule/inviteSpell?collageId=' + collageId + '&orderId=' + orderId + '&type=1' +
-						'&productId=' + productId + '&skuId=' + skuId + '&shopGroupWorkId=' + shopGroupWorkId
+    goInviteSpll(collageId, orderId, productId, skuId, shopGroupWorkId) {
+      uni.navigateTo({
+        url: '../goodsModule/inviteSpell?collageId=' + collageId + '&orderId=' + orderId + '&type=1' +
+            '&productId=' + productId + '&skuId=' + skuId + '&shopGroupWorkId=' + shopGroupWorkId
 
-				})
-			},
-			back() {
-				uni.switchTab({
-					url: '../../pages/tabbar/user/index'
-				});
-			},
-			//退款详情
-			refundDetail(item) {
-				uni.navigateTo({
-					url: 'refundDetails?item=' + JSON.stringify(item)
-				})
-			},
-			orderStateChange(index) {
-				this.type = index;
-				this.orderState = this.tabList[index].number
-				this.page = 1
-				this.list = []
-        this.ifEmpty = false
-				this.getListData()
-			},
-			// 订单列表数据
-			getListData() {
-				if (this.orderState == 0) {
-					this.orderState = ''
-				}
-				uni.showLoading({
-          mask: true,
-					title: '加载中...',
-				})
-				NET.request(API.FindOrderList, {
-					state: this.orderState,
-					page: this.page,
-					pageSize: this.pageSize
-				}, 'GET').then(res => {
-					if (res.data.list.length == 0) {
-						this.loadingType = 1
-						this.page = this.page
-					}
-					uni.hideLoading()
-					this.listTotal = res.data.total
-					this.list = this.list.concat(res.data.list)
-          if (this.list.length === 0) {
-            this.ifEmpty = true
+      })
+    },
+    back() {
+      uni.switchTab({
+        url: '../../pages/tabbar/user/index'
+      });
+    },
+    //退款详情
+    refundDetail(item) {
+      uni.navigateTo({
+        url: 'refundDetails?item=' + JSON.stringify(item)
+      })
+    },
+    orderStateChange(index) {
+      this.type = index;
+      this.orderState = this.tabList[index].number
+      this.page = 1
+      this.list = []
+      this.ifEmpty = false
+      this.getListData()
+    },
+    // 订单列表数据
+    getListData() {
+      if (this.orderState == 0) {
+        this.orderState = ''
+      }
+      uni.showLoading({
+        mask: true,
+        title: '加载中...',
+      })
+      NET.request(API.FindOrderList, {
+        state: this.orderState,
+        page: this.page,
+        pageSize: this.pageSize
+      }, 'GET').then(res => {
+        if (res.data.list.length == 0) {
+          this.loadingType = 1
+          this.page = this.page
+        }
+        uni.hideLoading()
+        this.listTotal = res.data.total
+        this.list = this.list.concat(res.data.list)
+        if (this.list.length === 0) {
+          this.ifEmpty = true
+        }
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    cancelOrder(orderId, index) {
+      this.currentOrderId = orderId
+      this.currentIndex = index
+      this.closeTips = true
+    },
+    doCancel() {
+      this.closeTips = false
+      uni.showLoading({
+        mask: true,
+        title: '提交中...',
+      })
+      NET.request(API.CancelOrder, {
+        orderId: this.currentOrderId
+      }, 'POST').then(res => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '取消成功',
+        })
+        setTimeout(() => {
+          // this.type = 0
+          // this.orderState = 0
+          this.page = 1
+          this.list = []
+          this.currentOrderId = null
+          this.currentIndex = null
+          this.getListData()
+        }, 1500);
+
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    goLogisticsTap(express, deliverFormid) {
+      uni.navigateTo({
+        url: 'logisticsInfo?express=' + express + '&deliverFormid=' + deliverFormid
+      })
+    },
+    confirmReceiptTap(orderId) {
+      uni.showModal({
+        title: '温馨提示',
+        content: '确定您已经收到货物，否则会造成财产损失',
+        confirmText: '确定收到',
+        cancelText: '点错了',
+        success: res => {
+          if (res.confirm) {
+            this.doConfirm(orderId)
+          } else if (res.cancel) {
+            console.log('用户点击取消')
           }
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			cancelOrder(orderId, index) {
-        this.currentOrderId = orderId
-        this.currentIndex = index
-        this.closeTips = true
-			},
-			doCancel() {
-        this.closeTips = false
-				uni.showLoading({
-          mask: true,
-					title: '提交中...',
-				})
-				NET.request(API.CancelOrder, {
-					orderId: this.currentOrderId
-				}, 'POST').then(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '取消成功',
-					})
-					setTimeout(() => {
-						// this.type = 0
-						// this.orderState = 0
-						this.page = 1
-						this.list = []
-            this.currentOrderId = null
-            this.currentIndex = null
-						this.getListData()
-					}, 1500);
-
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			goLogisticsTap(express, deliverFormid) {
-				uni.navigateTo({
-					url: 'logisticsInfo?express=' + express + '&deliverFormid=' + deliverFormid
-				})
-			},
-			confirmReceiptTap(orderId) {
-				uni.showModal({
-					title: '温馨提示',
-					content: '确定您已经收到货物，否则会造成财产损失',
-					confirmText: '确定收到',
-					cancelText: '点错了',
-					success: res => {
-						if (res.confirm) {
-							this.doConfirm(orderId)
-						} else if (res.cancel) {
-							console.log('用户点击取消')
-						}
-					}
-				})
-			},
-			doConfirm(orderId) {
-				NET.request(API.ConfirmReceive, {
-					orderId: orderId
-				}, 'POST').then(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '确认成功',
-					})
-					setTimeout(() => {
-						this.type = 4;
-						this.orderState = 4
-						this.page = 1
-						this.list = []
-						this.getListData()
-					}, 1500);
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			delOrder(orderId) {
-				uni.showModal({
-					title: '温馨提示',
-					content: '您确定要删除该订单吗？',
-					confirmText: '确定删除',
-					cancelText: '点错了',
-					success: res => {
-						if (res.confirm) {
-							this.doDel(orderId)
-						} else if (res.cancel) {
-							console.log('用户点击取消')
-						}
-					}
-				})
-			},
-			doDel(orderId) {
-				uni.showLoading({
-					title: '提交中...',
-				})
-				NET.request(API.DelOrder, {
-					orderId: orderId
-				}, 'POST').then(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '删除成功',
-					})
-					setTimeout(() => {
-						// this.type = 0;
-						// this.orderState = 0
-						this.page = 1
-						this.list = []
-						this.getListData()
-					}, 1500);
-
-				}).catch(res => {
-					uni.hideLoading()
-				})
-			},
-			// 跳转订单详情
-			itemTap(orderId, item) {
-				uni.setStorageSync("afterapplyItem", item)
-				uni.navigateTo({
-					url: 'orderDetails?orderId=' + orderId
-				})
-			},
-			goShop(id) {
-				uni.navigateTo({
-					url: "../store/index?storeId=" + id
-				})
+        }
+      })
+    },
+    doConfirm(orderId) {
+      NET.request(API.ConfirmReceive, {
+        orderId: orderId
+      }, 'POST').then(res => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '确认成功',
+        })
+        setTimeout(() => {
+          this.type = 4;
+          this.orderState = 4
+          this.page = 1
+          this.list = []
+          this.getListData()
+        }, 1500);
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    delOrder(orderId) {
+      uni.showModal({
+        title: '温馨提示',
+        content: '您确定要删除该订单吗？',
+        confirmText: '确定删除',
+        cancelText: '点错了',
+        success: res => {
+          if (res.confirm) {
+            this.doDel(orderId)
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    },
+    doDel(orderId) {
+      uni.showLoading({
+        title: '提交中...',
+      })
+      NET.request(API.DelOrder, {
+        orderId: orderId
+      }, 'POST').then(res => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '删除成功',
+        })
+        setTimeout(() => {
+          // this.type = 0;
+          // this.orderState = 0
+          this.page = 1
+          this.list = []
+          this.getListData()
+        }, 1500);
 
-			},
-			applyTap(item, index) {
-				// 申请售后
-				uni.navigateTo({
-					url: 'afterSaleApply?item=' + JSON.stringify(item)
-				})
-			},
-			payOrder(item, index) {
-				// #ifdef MP-ALIPAY
-				this.showPayTypePopup = true
-				this.totalPrice = item.orderPrice
-				// #endif
-				// #ifndef MP-ALIPAY
-				uni.showLoading({
-					title: '订单提交中...',
-				})
-				// #endif
-				let submitResult = {
-					collageId: item.collageId,
-					money: item.orderPrice,
-					orderId: item.orderId,
-					type: 2
-				}
-				// #ifdef H5
-				let ua = navigator.userAgent.toLowerCase();
-				// if (ua.match(/MicroMessenger/i) == "micromessenger") {
-				// 	this.payRequest(submitResult)
-				// } else {
+      }).catch(res => {
+        uni.hideLoading()
+      })
+    },
+    // 跳转订单详情
+    itemTap(orderId, item) {
+      uni.setStorageSync("afterapplyItem", item)
+      uni.navigateTo({
+        url: 'orderDetails?orderId=' + orderId
+      })
+    },
+    goShop(id) {
+      uni.navigateTo({
+        url: "../store/index?storeId=" + id
+      })
+
+    },
+    applyTap(item, index) {
+      // 申请售后
+      uni.navigateTo({
+        url: 'afterSaleApply?item=' + JSON.stringify(item)
+      })
+    },
+    payOrder(item, index) {
+      // #ifdef MP-ALIPAY
+      this.showPayTypePopup = true
+      this.totalPrice = item.orderPrice
+      // #endif
+      // #ifndef MP-ALIPAY
+      uni.showLoading({
+        title: '订单提交中...',
+      })
+      // #endif
+      let submitResult = {
+        collageId: item.collageId,
+        money: item.orderPrice,
+        orderId: item.orderId,
+        type: 2
+      }
+      // #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)
@@ -473,681 +561,688 @@
 						icon: 'none'
 					})
 				})
-				// }
-				// #endif
-				// #ifdef MP-ALIPAY
-				this.alipayInfo = submitResult
-				// #endif
-				// #ifdef MP-WEIXIN
-				let that = this
-				NET.request(API.gotoPay, submitResult, 'POST').then(res => {
-					console.log(item,'item订单提交9999')
-					console.log(res,'res订单提交9999')
-					let param = {
-						orderId: item.orderId,
-						collageId: item.collageId
-					}
-					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) {
-							// 拼团支付成功回调
-							if(param.collageId){
-								NET.request(API.paySuccess, param, 'POST').then(res => {
-									console.log(res,'支付成功')					 
-								})
-							}
-							uni.showToast({
-								icon: 'none',
-								title: '支付成功'
-							})
-							this.type = 0
-							this.page = 1
-							this.getListData()
-						},
-						fail: function(err) {
-							uni.showToast({
-								icon: 'none',
-								title: '支付失败'
-							})
-						}
-					})
-				}).catch(err => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '支付失败',
-						icon: 'none'
-					})
-				})
-				// #endif
-				// #ifdef APP-PLUS
-				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
-					}
-					uni.requestPayment({
-						provider: 'wxpay',
-						orderInfo: obj,
-						success: function(payRes) {
-							uni.showToast({
-								icon: 'none',
-								title: '支付成功'
-							})
-							this.type = 0
-							this.page = 1
-							this.getListData()
-						},
-						fail: function(err) {
-							console.log(err)
-							uni.showToast({
-								icon: 'none',
-								title: '支付取消'
-							})
-						}
-					})
-				}).catch(err => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '支付失败',
-						icon: 'none'
-					})
-				})
-				// #endif
-			},
-			continuePay() {
-				uni.showLoading({
-					title: '加载中...',
-				})
-				const payInfo = Object.assign({}, this.alipayInfo, {
-					'paymentMode': this.paymentMode,
-					'huabeiPeriod': this.huabeiPeriod
-				});
-				this.aliPay(payInfo)
-			},
-			// 支付宝支付
-			aliPay(payInfo) {
-				NET.request(API.gotoPay, payInfo, 'POST').then(res => {
-					console.log('alipay gotoPay-----------')
-					uni.requestPayment({
-						provider: 'alipay',
-						orderInfo: res.data.tradeNo,
-						success: function(payRes) {
-							uni.hideLoading()
-							if (payRes.resultCode == '6001') {
-								uni.showToast({
-									icon: 'none',
-									title: '取消支付'
-								})
-							}
-							if (payRes.resultCode == '9000') {
-								uni.showToast({
-									icon: 'none',
-									title: '支付成功'
-								})
-								uni.navigateTo({
-									url: 'index?type=0'
-								})
-							}
-						},
-						fail: function(err) {
-							uni.showToast({
-								icon: 'none',
-								title: '支付取消'
-							})
-						}
-					});
-				}).catch(err => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '支付失败',
-						icon: 'none'
-					})
-				})
-			},
-			// H5支付微信内置浏览器支付
-			payRequest(payInfo) {
-				payInfo.paymentMode = 1
-				NET.request(API.gotoPay, payInfo, 'POST').then(res => {
-					jweixin.config({
-						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-						appId: res.data.appId, // 必填，公众号的唯一标识
-						timestamp: res.data.timeStamp, // 必填，生成签名的时间戳
-						nonceStr: res.data.nonceStr, // 必填，生成签名的随机串
-						signature: res.data.paySign, // 必填，签名，见附录1
-						jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-					});
-					jweixin.ready(function() {
-						jweixin.checkJsApi({
-							jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
-							success: function(res) {
-								// console.log('checkjsapi Success')
-								// console.log(res);
-							},
-							fail: function(res) {
-								// console.log('res')
-								// console.log(res);
-							}
-						});
-						jweixin.chooseWXPay({
-							timestamp: res.data
-								.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
-							nonceStr: res.data.nonceStr, // 支付签名随机串，不长于 32 位
-							package: res.data
-								.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
-							signType: res.data.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
-							paySign: res.data.paySign, // 支付签名
-							success: function(res) {
-								// 支付成功后的回调函数
-								uni.showToast({
-									icon: 'none',
-									title: '支付成功'
-								})
-								uni.navigateTo({
-									url: 'index?type=0'
-								})
-							},
-							cancel: function(r) {
-								uni.showToast({
-									icon: 'none',
-									title: '取消支付'
-								})
-							},
-							fail: function(res) {
-								uni.showToast({
-									icon: 'none',
-									title: '支付失败'
-								})
-							}
-						});
-					});
-					jweixin.error(function(res) {
-						console.log('error')
-						console.log(res)
-						uni.hideLoading()
-						uni.showToast({
-							icon: 'none',
-							title: '支付失败了',
-							duration: 3000
-						});
-					});
-				}).catch(err => {
-					uni.hideLoading()
-				})
-			},
-			evaluateTap(item, orderId) {
-				uni.setStorageSync('evaluateItem', item)
-				uni.setStorageSync('orderId', orderId)
-				uni.navigateTo({
-					url: '../goodsModule/evaluate',
-				})
-			},
-			evaluateTowTap(index, commentId) {
-				console.log(commentId, 444)
-				uni.setStorageSync('addCommentVOList', this.list[index]);
-				uni.navigateTo({
-					url: '../goodsModule/addEvaluate?type=1&commentId=' + commentId
-				})
-			},
-			payTypeChange(event) {
-				this.paymentMode = event.target.value;
-				if (this.paymentMode == 2) {
-					this.huabeiPeriod = -1
-					this.fenqiDisabledList = [true, true, true]
-				} else {
-					this.huabeiPeriod = 3
-				}
-				this.recalcHuabei()
-			},
-			recalcHuabei() {
-				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.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) {
-						index = 1
-					} else if (this.huabeiPeriod == 12) {
-						index = 2
-					}
-					this.chargeFee = (this.totalPrice * (this.huabeiFeeRateList[index] / 100))
-						.toFixed(2)
-
-					if (this.totalPrice >= 0.03) {
-						this.fenqiDisabledList[0] = false
-					}
-					if (this.totalPrice >= 0.06) {
-						this.fenqiDisabledList[1] = false
-					}
-					if (this.totalPrice >= 0.12) {
-						this.fenqiDisabledList[2] = false
-					}
-				}
-			},
-			// 花呗分期数变更
-			huabeiPeriodChange(event) {
-				this.huabeiPeriod = event.target.value
-				this.recalcHuabei()
-			},
-			// 查询花呗分期配置
-			getHuabeiFeeRateList() {
-				NET.request(API.GetHuabeiConfig, {}, 'GET').then(res => {
-					this.huabeiChargeType = res.data.huabeiChargeType
-					if (this.huabeiChargeType == 2) {
-						this.huabeiFeeRateList = res.data.huabeiFeeRateList
-					}
-				})
-			}
-		},
-		filters: {
-			clip2Decimal(value) {
-				if (value === undefined || value === null) {
-					return "0.00"
-				}
-				return (parseInt(value * 100) / 100).toFixed(2)
-			}
-		}
-	}
+      }
+      // #endif
+      // #ifdef MP-ALIPAY
+      this.alipayInfo = submitResult
+      // #endif
+      // #ifdef MP-WEIXIN
+      let that = this
+      NET.request(API.gotoPay, submitResult, 'POST').then(res => {
+        console.log(item, 'item订单提交9999')
+        console.log(res, 'res订单提交9999')
+        let param = {
+          orderId: item.orderId,
+          collageId: item.collageId
+        }
+        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: (payRes) => {
+            // 拼团支付成功回调
+            if (param.collageId) {
+              NET.request(API.paySuccess, param, 'POST').then(res => {
+                console.log(res, '支付成功')
+              })
+            }
+            uni.showToast({
+              icon: 'none',
+              title: '支付成功'
+            })
+            this.type = 0
+            this.page = 1
+            this.orderState = ''
+            this.list = []
+            this.getListData()
+          },
+          fail: function (err) {
+            uni.showToast({
+              icon: 'none',
+              title: '支付失败'
+            })
+          }
+        })
+      }).catch(err => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '支付失败',
+          icon: 'none'
+        })
+      })
+      // #endif
+      // #ifdef APP-PLUS
+      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
+        }
+        uni.requestPayment({
+          provider: 'wxpay',
+          orderInfo: obj,
+          success: (payRes) => {
+            uni.showToast({
+              icon: 'none',
+              title: '支付成功'
+            })
+            this.type = 0
+            this.page = 1
+            this.orderState = ''
+            this.list = []
+            this.getListData()
+
+          },
+          fail: function (err) {
+            console.log(err)
+            uni.showToast({
+              icon: 'none',
+              title: '支付取消'
+            })
+          }
+        })
+      }).catch(err => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '支付失败',
+          icon: 'none'
+        })
+      })
+      // #endif
+    },
+    continuePay() {
+      uni.showLoading({
+        title: '加载中...',
+      })
+      const payInfo = Object.assign({}, this.alipayInfo, {
+        'paymentMode': this.paymentMode,
+        'huabeiPeriod': this.huabeiPeriod
+      });
+      this.aliPay(payInfo)
+    },
+    // 支付宝支付
+    aliPay(payInfo) {
+      NET.request(API.gotoPay, payInfo, 'POST').then(res => {
+        console.log('alipay gotoPay-----------')
+        uni.requestPayment({
+          provider: 'alipay',
+          orderInfo: res.data.tradeNo,
+          success: (payRes) => {
+            uni.hideLoading()
+            if (payRes.resultCode == '6001') {
+              uni.showToast({
+                icon: 'none',
+                title: '取消支付'
+              })
+            }
+            if (payRes.resultCode == '9000') {
+              uni.showToast({
+                icon: 'none',
+                title: '支付成功'
+              })
+              uni.navigateTo({
+                url: 'index?type=0'
+              })
+            }
+          },
+          fail: function (err) {
+            uni.showToast({
+              icon: 'none',
+              title: '支付取消'
+            })
+          }
+        });
+      }).catch(err => {
+        uni.hideLoading()
+        uni.showToast({
+          title: '支付失败',
+          icon: 'none'
+        })
+      })
+    },
+    // H5支付微信内置浏览器支付
+    payRequest(payInfo) {
+      payInfo.paymentMode = 1
+      NET.request(API.gotoPay, payInfo, 'POST').then(res => {
+        jweixin.config({
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: res.data.appId, // 必填，公众号的唯一标识
+          timestamp: res.data.timeStamp, // 必填，生成签名的时间戳
+          nonceStr: res.data.nonceStr, // 必填，生成签名的随机串
+          signature: res.data.paySign, // 必填，签名，见附录1
+          jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        });
+        jweixin.ready(function () {
+          jweixin.checkJsApi({
+            jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
+            success: function (res) {
+              // console.log('checkjsapi Success')
+              // console.log(res);
+            },
+            fail: function (res) {
+              // console.log('res')
+              // console.log(res);
+            }
+          });
+          jweixin.chooseWXPay({
+            timestamp: res.data
+                .timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+            nonceStr: res.data.nonceStr, // 支付签名随机串，不长于 32 位
+            package: res.data
+                .package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
+            signType: res.data.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+            paySign: res.data.paySign, // 支付签名
+            success: function (res) {
+              // 支付成功后的回调函数
+              uni.showToast({
+                icon: 'none',
+                title: '支付成功'
+              })
+              uni.navigateTo({
+                url: 'index?type=0'
+              })
+            },
+            cancel: function (r) {
+              uni.showToast({
+                icon: 'none',
+                title: '取消支付'
+              })
+            },
+            fail: function (res) {
+              uni.showToast({
+                icon: 'none',
+                title: '支付失败'
+              })
+            }
+          });
+        });
+        jweixin.error(function (res) {
+          console.log('error')
+          console.log(res)
+          uni.hideLoading()
+          uni.showToast({
+            icon: 'none',
+            title: '支付失败了',
+            duration: 3000
+          });
+        });
+      }).catch(err => {
+        uni.hideLoading()
+      })
+    },
+    evaluateTap(item, orderId) {
+      uni.setStorageSync('evaluateItem', item)
+      uni.setStorageSync('orderId', orderId)
+      uni.navigateTo({
+        url: '../goodsModule/evaluate',
+      })
+    },
+    evaluateTowTap(index, commentId) {
+      console.log(commentId, 444)
+      uni.setStorageSync('addCommentVOList', this.list[index]);
+      uni.navigateTo({
+        url: '../goodsModule/addEvaluate?type=1&commentId=' + commentId
+      })
+    },
+    payTypeChange(event) {
+      this.paymentMode = event.target.value;
+      if (this.paymentMode == 2) {
+        this.huabeiPeriod = -1
+        this.fenqiDisabledList = [true, true, true]
+      } else {
+        this.huabeiPeriod = 3
+      }
+      this.recalcHuabei()
+    },
+    recalcHuabei() {
+      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.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) {
+          index = 1
+        } else if (this.huabeiPeriod == 12) {
+          index = 2
+        }
+        this.chargeFee = (this.totalPrice * (this.huabeiFeeRateList[index] / 100))
+            .toFixed(2)
+
+        if (this.totalPrice >= 0.03) {
+          this.fenqiDisabledList[0] = false
+        }
+        if (this.totalPrice >= 0.06) {
+          this.fenqiDisabledList[1] = false
+        }
+        if (this.totalPrice >= 0.12) {
+          this.fenqiDisabledList[2] = false
+        }
+      }
+    },
+    // 花呗分期数变更
+    huabeiPeriodChange(event) {
+      this.huabeiPeriod = event.target.value
+      this.recalcHuabei()
+    },
+    // 查询花呗分期配置
+    getHuabeiFeeRateList() {
+      NET.request(API.GetHuabeiConfig, {}, 'GET').then(res => {
+        this.huabeiChargeType = res.data.huabeiChargeType
+        if (this.huabeiChargeType == 2) {
+          this.huabeiFeeRateList = res.data.huabeiFeeRateList
+        }
+      })
+    }
+  },
+  filters: {
+    clip2Decimal(value) {
+      if (value === undefined || value === null) {
+        return "0.00"
+      }
+      return (parseInt(value * 100) / 100).toFixed(2)
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background: #f6f6f6;
-	}
-
-	.nav-box-box {
-		height: 88upx;
-		background: #f6f6f6;
-		white-space: nowrap;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		z-index: 10;
-	}
-
-	.nav-box-box .item {
-		display: inline-view;
-		padding: 0 30upx;
-		box-sizing: border-box;
-		height: 88upx;
-		text-align: center;
-		line-height: 88upx;
-		font-size: 30upx;
-		color: #666;
-		font-weight: 500;
-	}
-
-	.nav-box-box .item.active text {
-		display: inline-view;
-		color: #ff7911;
-		box-sizing: border-box;
-		height: 88upx;
-		border-bottom: 2px solid #ff7911;
-	}
-
-	.order-list-box {
-		padding: 20upx 30upx 0;
-		box-sizing: border-box;
-	}
-
-	.order-list-box .item {
-		margin-bottom: 20upx;
-		background: #fff;
-		border-radius: 10upx;
-	}
-
-	.order-list-top {
-		height: 96upx;
-		padding: 0 30upx;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #eee;
-	}
-
-	.top-l {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.shop-img {
-		width: 36upx;
-		height: 36upx;
-		margin-right: 10upx;
-	}
-
-	.shop-name {
-		font-size: 30upx;
-		color: #333;
-		font-weight: bold;
-	}
-
-	.arrow-img {
-		margin-left: 15upx;
-		width: 25upx;
-		height: 25upx;
-	}
-
-	.order-status {
-		font-size: 32upx;
-		color: #C5AA7B;
-		font-weight: 400;
-	}
-
-	.order-info-box {
-		padding: 0 30upx;
-		box-sizing: border-box;
-
-		.btnBox {
-			width: 100%;
-			justify-content: flex-end;
-
-			.delIcon {
-				width: 40rpx;
-				height: 40rpx;
-				background: url("https://ceres.zkthink.com/static/images/delListOrder.png") no-repeat center center;
-				background-size: contain;
-			}
-		}
-
-		.flexSpBetween {
-			justify-content: space-between;
-		}
-	}
-
-	.order-info {
-		border-bottom: 1px solid #eee;
-	}
-
-	.order-info-item {
-		display: flex;
-		flex-direction: row;
-		padding: 20upx 0;
-	}
-
-	.product-img {
-		width: 180upx;
-		height: 180upx;
-		margin-right: 30upx;
-	}
-
-	.info-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-
-	.product-name {
-		font-size: 26upx;
-		color: #333;
-		height: 68upx;
-		line-height: 34upx;
-		display: -webkit-box;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		word-break: break-all;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-	}
-
-	.price-sku-box {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-	}
-
-	.product-sku {
-		font-size: 24upx;
-		color: #999;
-	}
-
-	.product-price {
-		font-size: 28upx;
-		color: #333;
-		font-weight: 400;
-	}
-
-	.product-price .fuhao {
-		font-size: 28upx;
-	}
-
-	.product-num {
-		display: inline-view;
-		font-size: 28upx;
-		margin-left: 20upx;
-		color: #999;
-	}
-
-	.total-price-box {
-		font-size: 26upx;
-		color: #333;
-		text-align: right;
-		padding: 30upx 0;
-	}
-
-	.order-btn-box {
-		padding: 20upx 0;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-	}
-
-	.order-btn-box .btn {
-		display: inline-view;
-		width: 150upx;
-		height: 56upx;
-		text-align: center;
-		line-height: 56upx;
-		font-size: 26upx;
-		color: #333;
-		margin-left: 20upx;
-	}
-
-	.evaluate {
-		height: 56upx;
-		text-align: center;
-		line-height: 56upx;
-		font-size: 26upx;
-		padding: 0 30upx;
-		color: #C5AA7B;
-		background: #333333;
-	}
-
-	.evaluate2 {
-		height: 56upx;
-		text-align: center;
-		line-height: 56upx;
-		font-size: 26upx;
-		padding: 0 30upx;
-		background: #333333;
-		color: #C5AA7B;
-	}
-
-	.order-btn-box .btn.l {
-		border: 2rpx solid #333333;
-		color: #333;
-	}
-
-	.order-btn-box .btn.r {
-		border: 2rpx solid #C5AA7B;
-		color: #C5AA7B;
-	}
-
-	.emptyOrder-box {
-		margin-top: 70upx;
-
-		.emptyOrder-img {
-			margin-top: 30%;
-			width: 216upx;
-			height: 152upx;
-		}
-	}
-
-	.pay-type-item {
-		.pay-type-radio {
-			background-color: white;
-			border-bottom: 1upx solid #EDEDED;
-			margin-bottom: 20upx;
-			padding: 24upx 20upx 24upx 20upx;
-
-			.pay-type-img {
-				display: inline-block;
-
-				.pay-type-img-inner {
-					width: 50upx;
-					height: 50upx;
-					vertical-align: middle;
-				}
-			}
-
-			.pay-type-label {
-				vertical-align: middle;
-				margin-left: 30upx;
-			}
-
-			.pay-type-radio-item {
-				float: right;
-				margin-right: 20upx;
-				width: 50upx;
-				height: 50upx;
-			}
-		}
-
-		.huabei-detail {
-			margin-top: 20upx;
-
-			.fenqi-wenzi {
-				display: inline-block;
-				margin-left: 64upx;
-			}
-
-			.fenqi-amount {
-				display: block;
-				margin-left: 64upx;
-				margin-top: 14upx;
-				color: #BABBBC;
-			}
-
-			.fenqi-charge-fee {
-				float: right;
-				margin-right: 68upx;
-				color: #BABBBC;
-			}
-
-			.fenqi-modal {
-				width: 40upx;
-				height: 40upx;
-				margin-left: 20upx;
-				float: right;
-				position: relative;
-				top: -80upx;
-			}
-		}
-	}
-
-	.paytype-confirm {
-		height: 120upx;
-		padding: 0upx 108upx 0upx 32upx;
-
-		.fenqi-all {
-			display: inline-block;
-			width: 100%;
-		}
-
-		.fenqi-total-amount {
-			width: 65%;
-			float: left;
-		}
-
-		.fenqi-confirm {
-			float: right;
-			width: 160upx;
-			padding: 0upx 20upx;
-
-			.btn {
-				width: 216upx;
-				height: 80upx;
-				line-height: 80upx;
-				border-radius: 40upx;
-				font-size: 28upx;
-				text-align: center;
-				background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
-				color: #fff;
-				display: inline-block;
-				margin-right: 66upx;
-			}
-		}
-	}
-
-	.period-radio {
-    margin: 30 upx;
-    padding-right: 100 upx;
-    width: 95%;
-    border-bottom: 1px solid #EFEFEF;
-
-    .period-amount {
+page {
+  width: 100%;
+  height: 100%;
+  background: #f6f6f6;
+}
+
+.nav-box-box {
+  height: 88upx;
+  background: #f6f6f6;
+  white-space: nowrap;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  z-index: 10;
+}
+
+.nav-box-box .item {
+  display: inline-view;
+  padding: 0 30upx;
+  box-sizing: border-box;
+  height: 88upx;
+  text-align: center;
+  line-height: 88upx;
+  font-size: 30upx;
+  color: #666;
+  font-weight: 500;
+}
+
+.nav-box-box .item.active text {
+  display: inline-view;
+  color: #ff7911;
+  box-sizing: border-box;
+  height: 88upx;
+  border-bottom: 2px solid #ff7911;
+}
+
+.order-list-box {
+  padding: 20upx 30upx 0;
+  box-sizing: border-box;
+}
+
+.order-list-box .item {
+  margin-bottom: 20upx;
+  background: #fff;
+  border-radius: 10upx;
+}
+
+.order-list-top {
+  height: 96upx;
+  padding: 0 30upx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #eee;
+}
+
+.top-l {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.shop-img {
+  width: 36upx;
+  height: 36upx;
+  margin-right: 10upx;
+}
+
+.shop-name {
+  font-size: 30upx;
+  color: #333;
+  font-weight: bold;
+}
+
+.arrow-img {
+  margin-left: 15upx;
+  width: 25upx;
+  height: 25upx;
+}
+
+.order-status {
+  font-size: 32upx;
+  color: #C5AA7B;
+  font-weight: 400;
+}
+
+.order-info-box {
+  padding: 0 30upx;
+  box-sizing: border-box;
+
+  .btnBox {
+    width: 100%;
+    justify-content: flex-end;
+
+    .delIcon {
+      width: 40rpx;
+      height: 40rpx;
+      background: url("https://ceres.zkthink.com/static/images/delListOrder.png") no-repeat center center;
+      background-size: contain;
+    }
+  }
+
+  .flexSpBetween {
+    justify-content: space-between;
+  }
+}
+
+.order-info {
+  border-bottom: 1px solid #eee;
+}
+
+.order-info-item {
+  display: flex;
+  flex-direction: row;
+  padding: 20upx 0;
+}
+
+.product-img {
+  width: 180upx;
+  height: 180upx;
+  margin-right: 30upx;
+}
+
+.info-box {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.product-name {
+  font-size: 26upx;
+  color: #333;
+  height: 68upx;
+  line-height: 34upx;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+.price-sku-box {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+.product-sku {
+  font-size: 24upx;
+  color: #999;
+}
+
+.product-price {
+  font-size: 28upx;
+  color: #333;
+  font-weight: 400;
+}
+
+.product-price .fuhao {
+  font-size: 28upx;
+}
+
+.product-num {
+  display: inline-view;
+  font-size: 28upx;
+  margin-left: 20upx;
+  color: #999;
+}
+
+.total-price-box {
+  font-size: 26upx;
+  color: #333;
+  text-align: right;
+  padding: 30upx 0;
+}
+
+.order-btn-box {
+  padding: 20upx 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+
+.order-btn-box .btn {
+  display: inline-view;
+  width: 150upx;
+  height: 56upx;
+  text-align: center;
+  line-height: 56upx;
+  font-size: 26upx;
+  color: #333;
+  margin-left: 20upx;
+}
+
+.evaluate {
+  height: 56upx;
+  text-align: center;
+  line-height: 56upx;
+  font-size: 26upx;
+  padding: 0 30upx;
+  color: #C5AA7B;
+  background: #333333;
+}
+
+.evaluate2 {
+  height: 56upx;
+  text-align: center;
+  line-height: 56upx;
+  font-size: 26upx;
+  padding: 0 30upx;
+  background: #333333;
+  color: #C5AA7B;
+}
+
+.order-btn-box .btn.l {
+  border: 2rpx solid #333333;
+  color: #333;
+}
+
+.order-btn-box .btn.r {
+  border: 2rpx solid #C5AA7B;
+  color: #C5AA7B;
+}
+
+.emptyOrder-box {
+  margin-top: 70upx;
+
+  .emptyOrder-img {
+    margin-top: 30%;
+    width: 216upx;
+    height: 152upx;
+  }
+}
+
+.pay-type-item {
+  .pay-type-radio {
+    background-color: white;
+    border-bottom: 1upx solid #EDEDED;
+    margin-bottom: 20upx;
+    padding: 24upx 20upx 24upx 20upx;
+
+    .pay-type-img {
       display: inline-block;
 
-      .period-each-charge {
-        display: inline-block;
-        margin-top: 12 upx;
-        margin-left: 6 upx;
-        font-size: 26 upx;
-        color: #b7b7b7;
-        margin-bottom: 13 upx;
+      .pay-type-img-inner {
+        width: 50upx;
+        height: 50upx;
+        vertical-align: middle;
       }
     }
 
-    .period-each {
+    .pay-type-label {
+      vertical-align: middle;
+      margin-left: 30upx;
+    }
+
+    .pay-type-radio-item {
+      float: right;
+      margin-right: 20upx;
+      width: 50upx;
+      height: 50upx;
+    }
+  }
+
+  .huabei-detail {
+    margin-top: 20upx;
+
+    .fenqi-wenzi {
+      display: inline-block;
+      margin-left: 64upx;
+    }
+
+    .fenqi-amount {
       display: block;
+      margin-left: 64upx;
+      margin-top: 14upx;
+      color: #BABBBC;
     }
 
-    .period-type-radio-item {
+    .fenqi-charge-fee {
       float: right;
+      margin-right: 68upx;
+      color: #BABBBC;
     }
+
+    .fenqi-modal {
+      width: 40upx;
+      height: 40upx;
+      margin-left: 20upx;
+      float: right;
+      position: relative;
+      top: -80upx;
+    }
+  }
+}
+
+.paytype-confirm {
+  height: 120upx;
+  padding: 0upx 108upx 0upx 32upx;
+
+  .fenqi-all {
+    display: inline-block;
+    width: 100%;
   }
-  .Put-box1 {
+
+  .fenqi-total-amount {
+    width: 65%;
+    float: left;
+  }
+
+  .fenqi-confirm {
+    float: right;
+    width: 160upx;
+    padding: 0upx 20upx;
+
     .btn {
-      text-align:center;
-      margin-top:40rpx;
-      border: 2rpx solid #333333;
-      height: 80rpx;
-      line-height: 80rpx;
-      width: 240rpx;
-      color: #333333;
+      width: 216upx;
+      height: 80upx;
+      line-height: 80upx;
+      border-radius: 40upx;
+      font-size: 28upx;
+      text-align: center;
+      background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
+      color: #fff;
+      display: inline-block;
+      margin-right: 66upx;
     }
-    .submit {
-      background-color: #333333;
-      color: #FFEBC4;
+  }
+}
+
+.period-radio {
+  margin: 30upx;
+  padding-right: 100upx;
+  width: 95%;
+  border-bottom: 1px solid #EFEFEF;
+
+  .period-amount {
+    display: inline-block;
+
+    .period-each-charge {
+      display: inline-block;
+      margin-top: 12upx;
+      margin-left: 6upx;
+      font-size: 26upx;
+      color: #b7b7b7;
+      margin-bottom: 13upx;
     }
   }
+
+  .period-each {
+    display: block;
+  }
+
+  .period-type-radio-item {
+    float: right;
+  }
+}
+
+.Put-box1 {
+  .btn {
+    text-align: center;
+    margin-top: 40rpx;
+    border: 2rpx solid #333333;
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 240rpx;
+    color: #333333;
+  }
+
+  .submit {
+    background-color: #333333;
+    color: #FFEBC4;
+  }
+}
 </style>
 <style scoped>
-	.container /deep/ .u-tab-item {
-		color: #999999 !important;
-	}
+.container /deep/ .u-tab-item {
+  color: #999999 !important;
+}
 </style>

pages_category_page1/orderModule/orderDetails.vue

@@ -729,22 +729,22 @@
 				}
 				// #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'
+				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'
+						})
 					})
-				})
-				// }
+				}
 				// #endif
 				// #ifdef MP-WEIXIN
 				NET.request(API.gotoPay, submitResult, 'POST').then(res => {
@@ -998,6 +998,13 @@
 			},
 			//申请退款
 			applyMoneyAllTap() {
+				this.dataList.skus.map(item => {
+					if(item.afterState){
+						this.isAllSelect = 0
+						console.log('要拆单')
+					}
+				})
+				console.log(this.isAllSelect,'this.isAllSelect')
 				if (this.orderRefundList.length === 0) {
 					uni.showToast({
 						title: '您所有商品已经申请退款，请勿重复申请',
@@ -1007,7 +1014,8 @@
 				}
 				uni.setStorageSync('afterSaleApplyRefund', this.orderRefundList)
 				uni.navigateTo({
-					url: `afterSaleApplyRefund?orderId=${this.orderId}&sellPriceitem=${this.dataList.price}&isAllSelect=1`,
+					url: `afterSaleApplyRefund?orderId=${this.orderId}&sellPriceitem=${this.dataList.price}
+					      &isAllSelect=${this.isAllSelect}`,
 				})
 			},
 			confirmReceiptTap() {
@@ -1046,8 +1054,27 @@
 			},
 			// 申请售后
 			applyTap() {
+				if (this.orderRefundList.length === 0) {
+					uni.showToast({
+						title: '您所有商品已经申请退款，请勿重复申请',
+						icon: 'none'
+					})
+					return
+				}
+				uni.setStorageSync('afterSaleApplyRefund', this.orderRefundList)
+				let productData = this.item
+				let isAllSelect = 1
+        let newArr = JSON.parse(JSON.stringify(productData))
+        newArr.skus.map((item,index) => {
+          console.log("item----",item)
+					if(item.afterState){
+            newArr.skus.splice(index,1)
+						isAllSelect = 0
+					}
+				})
+				console.log(isAllSelect,'00000000000')
 				uni.navigateTo({
-					url: 'afterSaleApply?item=' + JSON.stringify(this.item),
+					url: 'afterSaleApply?item=' + JSON.stringify(newArr) + '&isAllSelect='+ isAllSelect
 				})
 			},
 			// 支付类型变更

pages_category_page1/orderModule/paySuccessful.vue

@@ -71,7 +71,10 @@ export default {
     if (this.orderId) {
       this.getOrderPoliteFn()
     }
-    this.$refs.adWindow.getAd()
+    this.$nextTick(()=>{
+      this.$refs.adWindow.getAd()
+    })
+
   },
   methods: {
     goToOrder() {

pages_category_page1/store/index.vue

@@ -116,6 +116,13 @@
 										<view class="product-name">{{cItem.productName}}</view>
 										<view class="product-num font-color-C5AA7B mar-top-10">{{cItem.users}}人付款</view>
 										<view class="product-price-box">
+											<image v-if="cItem.activityType===1" class="iconImg" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png" alt="拼团icon"></image>
+											<image v-if="cItem.activityType === 2" class="iconImg"  src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="秒杀活动"></image>
+											<image v-if="cItem.activityType === 3" class="iconImg discountIcon" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-03-14/38184785db4b4fbca767ada611097ae9_discount.png" alt="限时折扣活动"></image>
+											<image v-if="cItem.activityType === 4" class="iconImg" src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="平台秒杀"></image>
+											<image v-if="cItem.activityType===5" class="iconImg" src="https://ceres.zkthink.com/static/images/discountListIcon.png" alt="平台折扣"></image>
+											<image v-if="cItem.activityType===9" class="iconImg" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png" alt="会员价"></image>			
+											<image v-if="cItem.activityType === 8" class="iconImg" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png" alt="场景营销"></image>
 											<text class="price-box fs40 font-color-C83732 mar-right-20">￥{{cItem.price}}</text>
 											<text class="price-through">￥{{cItem.originalPrice}}</text>
 										</view>
@@ -264,7 +271,7 @@
 				}).catch(res => {})
 			},
 			goodsItemTap(productId, skuId) {
-				wx.navigateTo({
+				uni.navigateTo({
 					url: '../goodsModule/goodsDetails?shopId=' + this.id + '&productId=' + productId + '&skuId=' +
 						skuId
 				})
@@ -837,6 +844,15 @@ page {
 	flex-direction: row;
 	align-items: center;
 	margin-top: 30rpx;
+	
+	.iconImg {
+		width: 58rpx;
+		height: 36rpx;
+		margin-right: 10rpx;
+	}
+	.discountIcon{
+		width: 100rpx;
+	}
 }
 .product-price-box .price-through {
 	text-decoration: line-through;

pages_category_page2/orderModule/refundDetails.vue

@@ -59,7 +59,7 @@
 <!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
 				<!--  平台介入拒绝-->
-				<view class="status-title-box" v-if="status == 6">
+				<view class="status-title-box" v-if="status == 9 && isPlaformState === 1">
 					<view class="l">
 						<text class="status">审核失败</text>
 					</view>
@@ -113,9 +113,9 @@
 				</view>
 			</view>
 			<!-- 平台介入关闭 -->
-			<view class="order-details-info-box mt20" v-if="status == 6">
+			<view class="order-details-info-box mt20" v-if="status == 9 && isPlaformState === 1">
 				<view class="address-box return-explain-box">
-					<view>平台介入申请失败，退款已关闭</view>
+					<view>平台介入申请失败</view>
 				</view>
 			</view>
 			<!-- 退款关闭 -->

pages_category_page2/userModule/accountLogin.vue

@@ -1,307 +1,338 @@
 <template>
-	<!-- 登录 -->
-	<view class="container flex-items-plus flex-column">
-		<view class="login-logoBox">
-			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
-		</view>
-		<view class="iphoneNum-box flex-row-plus flex-items">
-			<view style="margin-right: 30rpx">
-				<image class="loginIcon" src="https://ceres.zkthink.com/static/images/phone.png"></image>
-			</view>
-			<view>
-				<input v-model="loginQuery.account" placeholder-class="iphoneNum-input" type="number"
-					maxlength='11' placeholder="请输入您的手机号" />
-			</view>
-		</view>
-		<view class="flex-row-plus mar-top-20">
-			<view class="code-box">
-				<view style="margin-right: 30rpx">
-					<image class="loginIcon" src="https://ceres.zkthink.com/static/images/code.png"></image>
-				</view>
-				<view>
-					<input v-model="loginQuery.code" placeholder-class="codeNum-input" placeholder="请输入验证码" />
-				</view>
-			</view>
-			<view :class="disabled === true ? 'on' : ''" :disabled="disabled" class="getcode" @click="codede">{{text}}
-			</view>
-		</view>
-		<view class="mar-top-60">
-			<view class="registerBut mar-top-100" @click="login">登录</view>
-		</view>
-	</view>
+  <!-- 登录 -->
+  <view class="container flex-items-plus flex-column">
+    <view class="login-logoBox">
+      <image class="login-logo"
+             src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
+    </view>
+    <view class="iphoneNum-box flex-row-plus flex-items">
+      <view style="margin-right: 30rpx">
+        <image class="loginIcon"
+               src="https://ceres.zkthink.com/static/images/phone.png"></image>
+      </view>
+      <view>
+        <input v-model="loginQuery.account"
+               placeholder-class="iphoneNum-input"
+               type="number"
+               maxlength='11'
+               placeholder="请输入您的手机号"/>
+      </view>
+    </view>
+    <view class="flex-row-plus mar-top-20">
+      <view class="code-box">
+        <view style="margin-right: 30rpx">
+          <image class="loginIcon"
+                 src="https://ceres.zkthink.com/static/images/code.png"></image>
+        </view>
+        <view>
+          <input v-model="loginQuery.code"
+                 placeholder-class="codeNum-input"
+                 placeholder="请输入验证码"/>
+        </view>
+      </view>
+      <view :class="disabled === true ? 'on' : ''"
+            :disabled="disabled"
+            class="getcode"
+            @click="codede">{{ text }}
+      </view>
+    </view>
+    <view class="mar-top-60">
+      <view class="registerBut mar-top-100"
+            @click="login">登录
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	const NET = require('../../utils/request')
-	const API = require('../../config/api')
-	export default {
-		data() {
-			return {
-				loginQuery: {
-					account: '',
-					code: '',
-					salesId: '',
-				},
-				// 获取验证码
-				VerifyQuery: {
-					phone: ""
-				},
-				inviteSpell: {},
-				inviteSpelltype: false,
-				beforePage: undefined,
-				doubleBeforePage: undefined
-			}
-		},
-		mixins: [sendVerifyCode],
-		onLoad(options) {
-			if (options.inviteSpell == 1) {
-				this.inviteSpelltype = true
-				this.inviteSpell = uni.getStorageSync('inviteSpell');
-			}
-			this.loginQuery.salesId = uni.getStorageSync('salesId');
-			var pages = getCurrentPages()
-			if (pages.length >= 2) {
-				this.beforePage = pages[pages.length - 2]
-			}
-			if (pages.length >= 3) {
-				this.doubleBeforePage = pages[pages.length - 3]
-			}
-		},
-		methods: {
-			login() {
-				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
-				if (this.loginQuery.account == '') {
-					uni.showToast({
-						title: '请输入手机号！',
-						duration: 2000,
-						icon: 'none'
-					});
-				} else if (!phoneCodeVerification.test(this.loginQuery.account)) {
-					uni.showToast({
-						title: '请输入正确的手机号！',
-						duration: 2000,
-						icon: 'none'
-					});
-				} else {
-					const that = this
-					uni.showLoading({
-						mask: true,
-						title: '正在登录...',
-						duration: 2000,
-					});
-					NET.request(API.Login, {
-						type: 2,
-						phone: this.loginQuery.account,
-						verificationCode: this.loginQuery.code
-					}, 'POST').then(res => {
-						uni.hideLoading()
-						const item = res.data
-						uni.setStorageSync('storage_key', item);
-						if (uni.getStorageSync("salesId")) {
-							let salesId = uni.getStorageSync("salesId")
-							let shopId = uni.getStorageSync("shopId")
-							this.bindSalesCustomer(salesId, shopId)
-							uni.removeStorageSync('salesId');
-							uni.removeStorageSync('shopId');
-						}
-						if (this.inviteSpelltype == true) {
-							setTimeout(function() {
-								uni.reLaunch({
-									url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
-										this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
-										.orderId + '&type=0' + '&productId=' + this.inviteSpell
-										.productId + '&skuId=' + this.inviteSpell.skuId
-								})
-								uni.removeStorageSync('inviteSpell');
-							}, 2000)
-						} else {
-							if (that.beforePage && that.beforePage.route !==
-								'pages_category_page2/userModule/accountLogin' &&
-								that.beforePage.route !== 'pages_category_page2/userModule/login' &&
-								that.beforePage.route !== 'pages_category_page2/userModule/register') {
-								console.log(19)
-								uni.navigateBack({
-									delta: 1
-								})
-							} else if (that.doubleBeforePage && that.doubleBeforePage.route !==
-								'pages_category_page2/userModule/accountLogin' &&
-								that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
-								that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
-								uni.navigateBack({
-									delta: 2
-								})
-							} else {
-								setTimeout(function() {
-									uni.switchTab({
-										url: '../../pages/tabbar/user/index'
-									})
-								}, 600)
-							}
-						}
-					}).catch(res => {
-						console.log('Login failed')
-						console.dir(res)
-						uni.hideLoading()
-						uni.showToast({
-							title: res.data.message,
-							duration: 2000,
-							icon: 'none',
-						});
-					})
-				}
+import sendVerifyCode from "@/mixins/SendVerifyCode";
 
-			},
-			// 获取验证码
-			codede() {
-				this.getVerify()
-			},
-			getVerify() {
-				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
-				if (this.loginQuery.account == '') {
-					uni.showToast({
-						title: '请输入手机号！',
-						duration: 2000,
-						icon: 'none'
-					});
-				} else if (!phoneCodeVerification.test(this.loginQuery.account)) {
-					uni.showToast({
-						title: '请输入正确的手机号！',
-						duration: 2000,
-						icon: 'none'
-					});
-				} else {
-					this.VerifyQuery.phone = this.loginQuery.account
+const NET = require('../../utils/request')
+const API = require('../../config/api')
+export default {
+  data() {
+    return {
+      loginQuery: {
+        account: '',
+        code: '',
+        salesId: '',
+      },
+      // 获取验证码
+      VerifyQuery: {
+        phone: ""
+      },
+      inviteSpell: {},
+      inviteSpelltype: false,
+      beforePage: undefined,
+      doubleBeforePage: undefined
+    }
+  },
+  mixins: [sendVerifyCode],
+  onLoad(options) {
+    if (options.inviteSpell == 1) {
+      this.inviteSpelltype = true
+      this.inviteSpell = uni.getStorageSync('inviteSpell');
+    }
+    this.loginQuery.salesId = uni.getStorageSync('salesId');
+    var pages = getCurrentPages()
+    if (pages.length >= 2) {
+      this.beforePage = pages[pages.length - 2]
+    }
+    if (pages.length >= 3) {
+      this.doubleBeforePage = pages[pages.length - 3]
+    }
+  },
+  methods: {
+    login() {
+      let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+      if (this.loginQuery.account == '') {
+        uni.showToast({
+          title: '请输入手机号！',
+          duration: 2000,
+          icon: 'none'
+        });
+      } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
+        uni.showToast({
+          title: '请输入正确的手机号！',
+          duration: 2000,
+          icon: 'none'
+        });
+      } else {
+        const that = this
+        uni.showLoading({
+          mask: true,
+          title: '正在登录...',
+          duration: 2000,
+        });
+        NET.request(API.Login, {
+          type: 2,
+          phone: this.loginQuery.account,
+          verificationCode: this.loginQuery.code
+        }, 'POST').then(res => {
+          uni.hideLoading()
+          const item = res.data
+          uni.setStorageSync('storage_key', item);
+          if (uni.getStorageSync("salesId")) {
+            let salesId = uni.getStorageSync("salesId")
+            let shopId = uni.getStorageSync("shopId")
+            this.bindSalesCustomer(salesId, shopId)
+            uni.removeStorageSync('salesId');
+            uni.removeStorageSync('shopId');
+          }
+          // 购物车右上角数量
+          NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
+            let cartNum = 0
+            resCart.data.forEach(shopItem => {
+              shopItem.skus.forEach(goodsItem => {
+                cartNum += goodsItem.number
+              })
+            })
+            if (cartNum > 0) {
+              uni.setTabBarBadge({
+                index: 2,
+                text: cartNum.toString()
+              })
+            }
+            console.log(cartNum)
+            uni.setStorageSync('allCartNum', cartNum)
+          })
+          if (this.inviteSpelltype == true) {
+            setTimeout(function () {
+              uni.reLaunch({
+                url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
+                    this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
+                        .orderId + '&type=0' + '&productId=' + this.inviteSpell
+                        .productId + '&skuId=' + this.inviteSpell.skuId
+              })
+              uni.removeStorageSync('inviteSpell');
+            }, 2000)
+          } else {
+            if (that.beforePage && that.beforePage.route !==
+                'pages_category_page2/userModule/accountLogin' &&
+                that.beforePage.route !== 'pages_category_page2/userModule/login' &&
+                that.beforePage.route !== 'pages_category_page2/userModule/register') {
+              console.log(19)
+              uni.navigateBack({
+                delta: 1
+              })
+            } else if (that.doubleBeforePage && that.doubleBeforePage.route !==
+                'pages_category_page2/userModule/accountLogin' &&
+                that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
+                that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
+              uni.navigateBack({
+                delta: 2
+              })
+            } else {
+              setTimeout(function () {
+                uni.switchTab({
+                  url: '../../pages/tabbar/user/index'
+                })
+              }, 600)
+            }
+          }
+        }).catch(res => {
+          console.log('Login failed')
+          console.dir(res)
+          uni.hideLoading()
+          uni.showToast({
+            title: res.data.message,
+            duration: 2000,
+            icon: 'none',
+          });
+        })
+      }
 
-					NET.request(API.Verify, {
-						phone: this.VerifyQuery.phone,
-					}, 'GET').then(res => {
-						this.sendCode()
-					}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							duration: 1000,
-							icon: 'none'
-						});
-					})
-				}
+    },
+    // 获取验证码
+    codede() {
+      this.getVerify()
+    },
+    getVerify() {
+      let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+      if (this.loginQuery.account == '') {
+        uni.showToast({
+          title: '请输入手机号！',
+          duration: 2000,
+          icon: 'none'
+        });
+      } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
+        uni.showToast({
+          title: '请输入正确的手机号！',
+          duration: 2000,
+          icon: 'none'
+        });
+      } else {
+        this.VerifyQuery.phone = this.loginQuery.account
 
-			},
-			//绑定关系
-			bindSalesCustomer(salesId, storeId) {
-				if (salesId && storeId) {
-					//如果已登录，静默绑定客户关系，否则跳转到登录页面
-					NET.request(API.BindSalesCustomer, {
-						shopId: storeId,
-						distributorId: salesId
-					}, 'POST').then(res => {
-						uni.showToast({
-							title: "绑定成功",
-							icon: "none"
-						})
-					}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: "none"
-						})
-					})
+        NET.request(API.Verify, {
+          phone: this.VerifyQuery.phone,
+        }, 'GET').then(res => {
+          this.sendCode()
+        }).catch(res => {
+          uni.showToast({
+            title: res.data.message,
+            duration: 1000,
+            icon: 'none'
+          });
+        })
+      }
 
-				}
-			}
-		}
-	}
+    },
+    //绑定关系
+    bindSalesCustomer(salesId, storeId) {
+      if (salesId && storeId) {
+        //如果已登录，静默绑定客户关系，否则跳转到登录页面
+        NET.request(API.BindSalesCustomer, {
+          shopId: storeId,
+          distributorId: salesId
+        }, 'POST').then(res => {
+          uni.showToast({
+            title: "绑定成功",
+            icon: "none"
+          })
+        }).catch(res => {
+          uni.showToast({
+            title: res.data.message,
+            icon: "none"
+          })
+        })
+
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	.container {
-		background-color: #FFFFFF;
-		height: 100vh;
+.container {
+  background-color: #FFFFFF;
+  height: 100vh;
 
-		.login-logoBox {
-			margin-top: -300rpx;
+  .login-logoBox {
+    margin-top: -300rpx;
 
-			.login-logo {
-				width: 234rpx;
-				height: 193rpx;
-			}
-		}
+    .login-logo {
+      width: 234rpx;
+      height: 193rpx;
+    }
+  }
 
-		.iphoneNum-box {
-			margin-top: 100rpx;
-			border-bottom: 1rpx solid #DDDDDD;
-			height: 100rpx;
-			width: 600rpx;
+  .iphoneNum-box {
+    margin-top: 100rpx;
+    border-bottom: 1rpx solid #DDDDDD;
+    height: 100rpx;
+    width: 600rpx;
 
-			.loginIcon {
-				width: 40rpx;
-				height: 53rpx;
-			}
+    .loginIcon {
+      width: 40rpx;
+      height: 53rpx;
+    }
 
-			.iphoneNum-input {
-				color: #999999;
-				font-size: 28rpx;
-				font-weight: 400;
-			}
-		}
+    .iphoneNum-input {
+      color: #999999;
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
 
-		.passwordNum-box {
-			border-bottom: 1rpx solid #DDDDDD;
-			height: 100rpx;
-			width: 600rpx;
+  .passwordNum-box {
+    border-bottom: 1rpx solid #DDDDDD;
+    height: 100rpx;
+    width: 600rpx;
 
-			.passwordNum-input {
-				color: #999999;
-				font-size: 28rpx;
-				font-weight: 400;
-				width: 346rpx;
-			}
-		}
+    .passwordNum-input {
+      color: #999999;
+      font-size: 28rpx;
+      font-weight: 400;
+      width: 346rpx;
+    }
+  }
 
-		.code-box {
-			border-bottom: 1rpx solid #DDDDDD;
-			height: 100rpx;
-			width: 360rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
+  .code-box {
+    border-bottom: 1rpx solid #DDDDDD;
+    height: 100rpx;
+    width: 360rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
 
-			.loginIcon {
-				width: 44rpx;
-				height: 50rpx;
-			}
+    .loginIcon {
+      width: 44rpx;
+      height: 50rpx;
+    }
 
-			.code-lab {
-				width: 200rpx;
-			}
+    .code-lab {
+      width: 200rpx;
+    }
 
-			.codeNum-input {
-				color: #999999;
-				font-size: 28rpx;
-				font-weight: 400;
-			}
-		}
+    .codeNum-input {
+      color: #999999;
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
 
-		.getcode {
-			background-color: #C5AA7B;
-			height: 100rpx;
-			width: 230rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			margin-left: 20rpx;
-			color: #FFFFFF;
-		}
+  .getcode {
+    background-color: #C5AA7B;
+    height: 100rpx;
+    width: 230rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    margin-left: 20rpx;
+    color: #FFFFFF;
+  }
 
-		.registerBut {
-			background: #333333;
-			color: #FFEBC4;
-			height: 100rpx;
-			width: 600rpx;
-			text-align: center;
-			line-height: 100rpx;
-			margin-top: 30rpx;
-		}
-	}
+  .registerBut {
+    background: #333333;
+    color: #FFEBC4;
+    height: 100rpx;
+    width: 600rpx;
+    text-align: center;
+    line-height: 100rpx;
+    margin-top: 30rpx;
+  }
+}
 </style>

pages_category_page2/userModule/collection.vue

@@ -18,7 +18,7 @@
 				<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)"
+						<u-swipe-action :disabled="allCheckShow" ref="actionSwipe" :show="item.show" :autoClose="false" @open="productOpen(index)"
 							@click="productActionClick" :options="options">
 							<!-- :disabled="allCheckShow" -->
 							<view class="flex-item" @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)">
@@ -39,8 +39,15 @@
 											<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>
+												<!-- <image v-if="item.activityType" class="iconImg mar-right-10"
+													:src="imgs[item.activityType]"></image> -->
+													<image v-if="item.activityType===1" class="iconImg" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png" alt="拼团icon"></image>
+													<image v-if="item.activityType === 2" class="iconImg"  src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="秒杀活动"></image>
+													<image v-if="item.activityType === 3" class="iconImg discountIcon" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-03-14/38184785db4b4fbca767ada611097ae9_discount.png" alt="限时折扣活动"></image>
+													<image v-if="item.activityType === 4" class="iconImg" src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="平台秒杀"></image>
+													<image v-if="item.activityType===5" class="iconImg" src="https://ceres.zkthink.com/static/images/discountListIcon.png" alt="平台折扣"></image>
+													<image v-if="item.activityType===9" class="iconImg" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png" alt="会员价"></image>			
+													<image v-if="item.activityType === 8" class="iconImg" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png" alt="场景营销"></image>
 												<text class="fs40 font-color-C83732">¥</text>
 												<text class="fs40 font-color-C83732 mar-right-20">{{item.price}}</text>
 												<text
@@ -84,7 +91,7 @@
 				</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="storeActionClick(index)"
+						<u-swipe-action ref="shopActionSwipe" :disabled="allCheckShow" :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">
@@ -367,10 +374,12 @@
 				// 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
 				// 原本为'false'，再次设置为'false'会无效
 				this.productCollect[index].show = true;
-				this.productCollect.map((val, idx) => {
-					if (index != idx) this.productCollect[idx].show = false;
+        // console.log(this.productCollect,index)
+
+        this.productCollect.map((val, idx) => {
+            if (index != idx) this.productCollect[idx].show = false;
 				})
-				// 商品删除参数
+        // 商品删除参数
 				this.ids = this.productCollect[index].collectId
 				this.currentIndex = index
 				this.currentType = 1
@@ -446,6 +455,15 @@
 			},
 			editClick() {
 				this.allCheckShow = true
+        let actionSwipe = this.$refs.actionSwipe;
+        let shopActionSwipe = this.$refs.shopActionSwipe;
+        if(actionSwipe){
+          actionSwipe.forEach(item=>item.close())
+        }
+        if(shopActionSwipe){
+          shopActionSwipe.forEach(item=>item.close())
+        }
+        console.log(shopActionSwipe)
 			},
 			finishClick() {
 				this.allCheckShow = false
@@ -467,9 +485,10 @@
 						this.proloadingType = 1
 						this.productPage = this.productPage
 					} else {
-						console.log(this.productCollect, 222)
 						this.productCollect = this.productCollect.concat(res.data.list)
-						this.productCollect.forEach((value, index) => {
+            console.log(this.productCollect, 222)
+
+            this.productCollect.forEach((value, index) => {
 							value['show'] = false
 							value['selected'] = 0
 						})
@@ -483,6 +502,7 @@
 			},
 			//收藏店铺查询
 			getStoreCollect() {
+        console.log(111)
 				uni.showLoading({
 					mask: true,
 					title: '加载中...'
@@ -499,6 +519,7 @@
 						this.storePage = this.storePage
 					}
 					this.storeCollect = this.storeCollect.concat(res.data.list)
+
 					this.storeCollect.forEach((value, index) => {
 						value['show'] = false
 						value['selected'] = 0
@@ -764,6 +785,9 @@
 			height: 36rpx;
 			margin-right: 10rpx;
 		}
+		.discountIcon{
+			width: 100rpx;
+		}
 	}
 </style>
 <style scoped>

pages_category_page2/userModule/footprintList.vue

@@ -13,7 +13,8 @@
 					<label class="mar-left-30">{{ditem.createTime}}</label>
 				</view>
         <view class="listItem" :index="index" v-for="(item, index) in ditem.products" :key="item.footprintId" @click="click(index,findex)">
-          <u-swipe-action :show="item.show" @open="open(index,findex)" @click="delFootProduction(index,findex)" :options="options">
+          <u-swipe-action :show="item.show"  ref="footActionSwipe" :disabled="allCheckShow"
+		  @open="open(index,findex)" @click="delFootProduction(index,findex)" :options="options">
             <view class="itemBox">
               <view @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)" class="item wid flex-display">
                 <view v-if="allCheckShow" class="selectIconBox">
@@ -25,8 +26,15 @@
                 <view class="title-wrap mar-left-20">
                   <text class="title u-line-2 fs28">{{ item.productName }}</text>
                   <view class="flex-items">
-                    <label class="fs40 mar-right-20 font-color-C83732">¥{{item.price}}</label>
-                    <label class="font-color-CCC discountsPriceLine fs24">¥{{item.originalPrice}}</label>
+										<image v-if="item.activityType===1" class="iconType" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png" alt="拼团icon"></image>
+										<image v-if="item.activityType === 2" class="iconType"  src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="秒杀活动"></image>
+										<image v-if="item.activityType === 3" class="iconType discountIcon" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-03-14/38184785db4b4fbca767ada611097ae9_discount.png" alt="限时折扣活动"></image>
+										<image v-if="item.activityType === 4" class="iconType" src="https://ceres.zkthink.com/static/images/spikeIcon.png" alt="平台秒杀"></image>
+										<image v-if="item.activityType===5" class="iconType" src="https://ceres.zkthink.com/static/images/discountListIcon.png" alt="平台折扣"></image>
+										<image v-if="item.activityType===9" class="iconType" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png" alt="会员价"></image>			
+						        <image v-if="item.activityType === 8" class="iconType" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png" alt="场景营销"></image>
+                    <label class="fs40 mar-right-20 font-color-C83732">¥{{ item.price }}</label>
+                    <label class="font-color-CCC discountsPriceLine fs24">¥{{ item.originalPrice }}</label>
                   </view>
                 </view>
               </view>
@@ -271,6 +279,10 @@
 			},
 			editClick(){
 				this.allCheckShow = true
+				let footActionSwipe = this.$refs.footActionSwipe;
+				if(footActionSwipe){
+				  footActionSwipe.forEach(item=>item.close())
+				}
 			},
 			finishClick(){
 				this.allCheckShow = false
@@ -338,6 +350,14 @@ page {
 			flex: 0 0 200rpx;
 			height: 200rpx;
 		}
+		.iconType{
+			width: 64rpx;
+			height: 38rpx;
+			margin-right: 10rpx;
+		}
+		.discountIcon{
+			width: 100rpx;
+		}
 		.head-img{
 			width: 80rpx;
 			flex: 0 0 80rpx;

pages_category_page2/userModule/memberAccount.vue

@@ -61,7 +61,7 @@
 				})
 			},
 			memberAccountWithdraw(){
-				if(this.accountInfo.price < 1){
+				if(this.accountInfo.price <= 0 ){
 					uni.showToast({
 						title: "您暂时没有余额，不能提现",
 						duration: 2000,

pages_category_page2/userModule/messageCenter.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="messageCenter">
 		<view>
-			<view class="flex-items flex-sp-between fs26 topTitBox">
+			<view v-if="messageList.length" class="flex-items flex-sp-between fs26 topTitBox">
 				<view>
 					未读消息{{num}}条
 				</view>
@@ -40,7 +40,7 @@
 				</view>
 			</u-swipe-action>
 		</view>
-		<view v-if="ifEmpty" class="mar-top-60 empty-box">
+		<view v-if="ifEmpty" class="empty-box">
 			<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<view class="tohome-box flex-items-plus">暂无消息</view>
 		</view>
@@ -89,6 +89,8 @@
 			GetUser() {
 				NET.request(API.GetUser, {}, 'GET').then(res => {
 					this.num = res.data.notRead
+					console.log(this.num,'this.num')
+					console.log(res.data,'res.data')
 				}).catch(res => {
 
 				})
@@ -273,6 +275,7 @@
 			justify-content: center;
 			flex-direction: column;
 			align-items: center;
+			padding-top: 50% ;
 			.tohome-box {
 				color: #999999;
 				margin-top: 50rpx;

pages_category_page2/userModule/personalDetails.vue

@@ -289,6 +289,7 @@
 				setTimeout(function() {
 					uni.removeStorageSync('storage_key');
 					uni.removeStorageSync('distributorId');
+          uni.removeStorageSync("allCartNum")
 					uni.reLaunch({
 						url: 'login',
 						success() {

pages_category_page2/userModule/questionList.vue

@@ -6,7 +6,7 @@
 			</u-tabs>
 		</view>
 		<view v-if="questionTypeFlag == 0">
-			<view>
+			<view v-if="problemList.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">
@@ -17,7 +17,8 @@
 				</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">
+						:key="item.problemId" :disabled="allCheckShow" ref="problemActionSwipe" @click="problemClick" :autoClose="false" 
+						@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">
@@ -62,13 +63,13 @@
 				</view>
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
-			<view v-if="ifEmpty" class="mar-top-60 empty-box">
+			<view v-if="ifEmpty" class="empty-box">
 				<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<view class="tohome-box flex-items-plus">暂无提问内容</view>
 			</view>
 		</view>
 		<view v-if="questionTypeFlag == 1">
-			<view>
+			<view v-if="answerList.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">
@@ -77,7 +78,7 @@
 				</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">
+						:key="item.answerId" :disabled="allCheckShow" ref="answerActionSwipe" :autoClose="false"  @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%;">
@@ -136,7 +137,7 @@
 				</view>
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
-			<view v-if="ifEmpty" class="mar-top-60 empty-box">
+			<view v-if="ifEmpty" class="empty-box">
 				<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<view class="tohome-box flex-items-plus">暂无问答内容</view>
 			</view>
@@ -336,20 +337,44 @@
 					this.isAllAnswerCheck = true
 				}
 			},
+			//删除提问
 			problemClick(index, index1) {
 				if (index1 == 0) {
 					let ids = this.problemList[index].problemId
-					this.cancelProblem(ids)
-					this.problemList.splice(index, 1);
-					this.$u.toast(`删除成功`);
+					NET.request(API.deleteProblem, {
+						ids: [ids]
+					}, 'POST').then(res => {
+						this.problemPage = 1
+						this.problemList = []
+						this.proloadingType = 0
+						this.getProblemList()
+						this.$u.toast(`删除成功`);
+					}).catch(err => {
+						uni.showToast({
+							title: '删除失败',
+							icon: "none"
+						})
+					})
 				}
 			},
+			//删除回答
 			answerClick(index, index1) {
 				if (index1 == 0) {
 					let ids = this.answerList[index].answerId
-					this.cancelAnswer(ids)
-					this.answerList.splice(index, 1);
-					this.$u.toast(`删除成功`);
+					NET.request(API.deleteAnswer, {
+						ids: [ids]
+					}, 'POST').then(res => {
+						this.answerPage = 1
+						this.answerList = []
+						this.answerloadingType = 0
+						this.getAnswerList()
+						this.$u.toast(`删除成功`);
+					}).catch(res => {
+						uni.showToast({
+							title: '删除失败',
+							icon: "none"
+						})
+					})
 				}
 			},
 			problemOpen(index) {
@@ -364,28 +389,6 @@
 					if (index != idx) this.answerList[idx].show = false;
 				})
 			},
-			//删除提问
-			cancelProblem(ids) {
-				NET.request(API.deleteProblem, {
-					ids: [ids]
-				}, 'POST').then(res => {}).catch(res => {
-					uni.showToast({
-						title: '失败',
-						icon: "none"
-					})
-				})
-			},
-			//删除回答
-			cancelAnswer(ids) {
-				NET.request(API.deleteAnswer, {
-					ids: [ids]
-				}, 'POST').then(res => {}).catch(res => {
-					uni.showToast({
-						title: '失败',
-						icon: "none"
-					})
-				})
-			},
 			//我的提问列表
 			getProblemList() {
 				uni.showLoading({
@@ -408,6 +411,8 @@
 					}
 					if (this.problemList.length === 0) {
 						this.ifEmpty = true
+					}else{
+						this.ifEmpty = false
 					}
 				}).catch(res => {
 					uni.showToast({
@@ -438,6 +443,8 @@
 					}
 					if (this.answerList.length === 0) {
 						this.ifEmpty = true
+					}else{
+						this.ifEmpty = false
 					}
 				}).catch(res => {
 					uni.showToast({
@@ -463,6 +470,14 @@
 			},
 			editClick() {
 				this.allCheckShow = true
+				let problemActionSwipe = this.$refs.problemActionSwipe
+				let answerActionSwipe = this.$refs.answerActionSwipe
+				if(problemActionSwipe){
+					problemActionSwipe.forEach(item=>item.close())
+				}
+				if(answerActionSwipe){
+					answerActionSwipe.forEach(item=>item.close())
+				}
 			},
 			finishClick() {
 				this.allCheckShow = false
@@ -520,6 +535,7 @@
 			justify-content: center;
 			flex-direction: column;
 			align-items: center;
+			padding-top: 40%;
 
 			.tohome-box {
 				color: #999999;
@@ -527,8 +543,8 @@
 			}
 
 			.question-empty {
-				width: 113rpx;
-				height: 98rpx;
+				width: 198rpx;
+				height: 183rpx;
 			}
 		}
 
@@ -603,6 +619,7 @@
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
+        padding: 10rpx 0;
 
 				.item-btn-right {
 					margin-left: 15rpx;