Merge branch 'v1.5' of https://git.dayouqiantu.cn/yshop-multimer/ceres-uniapp into v1.5

 Conflicts:

	components/canvasShow/basics/banner.vue

pages.json

@@ -114,6 +114,11 @@
 				"style": {
 					"navigationBarTitleText": "商品列表"
 				}
+			},{
+				"path": "goodsModule/canvasGoods",
+				"style": {
+					"navigationBarTitleText": "商品列表"
+				}
 			}, {
 				"path": "goodsModule/couponShopList",
 				"style": {
@@ -323,7 +328,10 @@
 			}, {
 				"path": "distributionModule/promotion",
 				"style": {
-					"navigationBarTitleText": "推广店铺"
+					"navigationBarTitleText": "推广店铺",
+					"navigationBarBackgroundColor": "#333333",
+					"backgroundColor": "#333333",
+					"navigationBarTextStyle": "white"
 				}
 			},
 			{

pages/tabbar/cart/index.vue

@@ -1,1387 +1,1498 @@
 <template>
-	<view class="content">
-		<!-- 购物车 -->
-		<view v-if="!isEmpty">
-			<view class="cart-bg">
-				<view class="cart-num-box">
-					<image src="../../../static/images/logoTop.png"></image>
-					<text class="btn-box" @click="btnTypeClick(1)" v-if="btnType == 0">管理</text>
-					<text class="btn-box" @click="btnTypeClick(0)" v-if="btnType == 1">完成</text>
-				</view>
-				<view>
-					<text class="num-box">共<text class="num">{{allNum}}</text>件宝贝</text>
-				</view>
-			</view>
-			<view class="cart-list-box">
-				<view v-for="(item, index) in dataList" :key="item.shopId">
-					<view class="item" v-if="item.skus.length !== 0">
-						<view class="shop-box">
-							<image mode="aspectFill" v-if="item.selected === 1" src="../../../static/images/selectActive.png" class="cart-select-img" @click.stop="updateShopSel(index,0)"></image>
-							<image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png" class="cart-select-img" @click.stop="updateShopSel(index,1)"></image>
-							<view class="shop-name-box" @click="goStore(index)">
-								<image src="../../../static/images/orderStoreIcon.png" class="shop-img"></image>
-								<text class="shop-name">{{item.shopName}}</text>
-								<image src="../../../static/images/arrowRight.png" class="arrow-right-img"></image>
-							</view>
-						</view>
-						<view v-for="(skuItem, cIndex) in dataList[index].skus" class="product-list-box">
-							<view class="pro-item" @click="goodsDateils(item.shopId,skuItem.productId,skuItem.skuId)">
-								<image mode="aspectFill" v-if="skuItem.selected == 1"
-									src="../../../static/images/selectActive.png"
-									@click.stop="cartItemSel(index,cIndex,0)" class="cart-select-img"></image>
-								<image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
-									@click.stop="cartItemSel(index,cIndex,1)" class="cart-select-img"></image>
-								<view class="pro-r">
-									<image :src="skuItem.image" class="pro-img"></image>
-									<view class="pro-r-r">
-										<view class="pro-name">{{skuItem.productName}}</view>
-										<view class="sku-box">
-											<text v-if="skuItem.value">{{skuItem.value}}</text>
-											<text v-else>默认规格</text>
-											<!-- <text></text> -->
-										</view>
-										<view class="pro-price-num-box">
-											<view class="pro-price-box">
-												<text class="fuhao">￥</text>
-												<text>{{skuItem.price}}</text>
-											</view>
-											<view class="pro-num-box">
-												<text class="num-btn r" @click.stop="numSub(index,cIndex)">-</text>
-												<text class="num">{{skuItem.number}}</text>
-												<text class="num-btn l" @click.stop="numAdd(index,cIndex)">+</text>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</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" class="skuStyle">
-							<label class="fs24 font-color-999">{{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="goodsNum-box flex-row-plus flex-sp-between" :class="{'bottom-line' :supportHuabei}">
-						<label class="font-color-999 fs24">数量</label>
-						<view class="goodsNum">
-							<text class="subtract" @click="updateNumSub()">-</text>
-							<text class="goodsNumber" v-model="buyNum">{{buyNum}}</text>
-							<text class="add" @click.stop="updateNumAdd()">+</text>
-						</view>
-					</view>
-					<view class="goosDetailbut-box flex-items-plus">
-						<button type="default" @click="goodsDateils(shopId,productId,skuId)" >查看详情</button>
-						<button type="default" class="submitBtn" @click="submitBtn()">确认</button>
-					</view>
-				</view>
-			</u-popup>
-
-			<!-- #ifdef H5 -->
-			<view class="cart-bottom-box-h5">
-				<!-- #endif -->
-				<!-- #ifndef H5 -->
-				<view class="cart-bottom-box-app">
-					<!-- #endif -->
-					<view class="cart-bottom">
-						<view class="left">
-							<image mode="aspectFill" v-if="isAllCheck" src="../../../static/images/selectActive.png"
-								class="cart-select-img" @click="allSel(0)"></image>
-							<image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
-								class="cart-select-img" @click="allSel(1)"></image>
-							<text>全选</text>
-						</view>
-						<view class="right" v-if="btnType == 0">
-							<view class="price-box">
-								<text>合计：</text>
-								<text class="price">¥{{checkMoney}}</text>
-							</view>
-							<view class="btn-confirm" @click="settlementTap">结算（{{checkNum}}）</view>
-						</view>
-						<view class="right" v-if="btnType == 1">
-							<view class="btn-delete" @click="cartDel">删除</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 购物车为空 -->
-			<view v-if="isEmpty" class="emptyCart-box flex-items-plus flex-column">
-				<image class="emptyCart-img" src="../../../static/images/cartEmpty.png"></image>
-				<label class="font-color-999 fs26 mar-top-30">你的购物车还没有宝贝哦</label>
-				<label class="font-color-999 fs26 mar-top-10">快去首页选一个吧～</label>
-				<view class="goToShopping" @click="goToShopping">去购物</view>
-			</view>
-			<!-- 删除确认弹窗 -->
-			<tui-modal :show="cardModal" :custom="true" :fadein="true">
-				<view class="Put-box1">
-					<view class="text-align fs34 fs-bold">
-						温馨提示
-					</view>
-					<view class="mar-top-40 text-align">
-						您确定删除选中的商品吗？
-					</view>
-					<view class="flex-display flex-sp-between">
-						<view class="btn" @click="cardModal = false">
-							点错了
-						</view>
-						<view class="btn submit" @click="doDelete">
-							确认删除
-						</view>
-					</view>
-				</view>
-			</tui-modal>
-		</view>
+  <view class="content">
+    <!-- 购物车 -->
+    <view v-if="!isEmpty">
+      <view class="cart-bg">
+        <view class="cart-num-box">
+          <image src="../../../static/images/logoTop.png"></image>
+          <text class="btn-box" @click="btnTypeClick(1)" v-if="btnType == 0">管理</text>
+          <text class="btn-box" @click="btnTypeClick(0)" v-if="btnType == 1">完成</text>
+        </view>
+        <view>
+          <text class="num-box">共<text class="num">{{allNum}}</text>件宝贝</text>
+        </view>
+      </view>
+      <view class="cart-list-box">
+        <view v-for="(item, index) in dataList" :key="item.shopId">
+          <view class="item" v-if="item.skus.length !== 0">
+            <view class="shop-box">
+              <image mode="aspectFill" v-if="item.selected === 1" src="../../../static/images/selectActive.png" class="cart-select-img" @click.stop="updateShopSel(index,0)"></image>
+              <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png" class="cart-select-img" @click.stop="updateShopSel(index,1)"></image>
+              <view class="shop-name-box" @click="goStore(index)">
+                <image src="../../../static/images/orderStoreIcon.png" class="shop-img"></image>
+                <text class="shop-name">{{item.shopName}}</text>
+                <image src="../../../static/images/arrowRight.png" class="arrow-right-img"></image>
+              </view>
+            </view>
+            <view class="rulesBox flex-items" v-if="item.currentRules.number">
+              <image class="mar-right-20" src="../../../static/images/zuheIcon.png"></image>
+              <view class="fs24 font-color-C83732">已满足【{{item.currentRules.price}}元任选{{item.currentRules.number}}件】！</view>
+            </view>
+            <view v-for="(skuItem, cIndex) in dataList[index].skus" class="product-list-box">
+              <view class="pro-item" @click="goodsDateils(item.shopId,skuItem.productId,skuItem.skuId)">
+                <image mode="aspectFill" v-if="skuItem.selected == 1"
+                       src="../../../static/images/selectActive.png"
+                       @click.stop="cartItemSel(index,cIndex,0)" class="cart-select-img"></image>
+                <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
+                       @click.stop="cartItemSel(index,cIndex,1)" class="cart-select-img"></image>
+                <view class="pro-r">
+                  <image :src="skuItem.image" class="pro-img"></image>
+                  <view class="pro-r-r">
+                    <view class="pro-name">{{skuItem.productName}}</view>
+                    <view class="sku-box">
+                      <text v-if="skuItem.value">{{skuItem.value}}</text>
+                      <text v-else>默认规格</text>
+                      <!-- <text></text> -->
+                    </view>
+                    <view class="pro-price-num-box">
+                      <view class="pro-price-box">
+                        <text class="fuhao">￥</text>
+                        <text>{{skuItem.price}}</text>
+                      </view>
+                      <view class="pro-num-box">
+                        <text class="num-btn r" @click.stop="numSub(index,cIndex)">-</text>
+                        <text class="num">{{skuItem.number}}</text>
+                        <text class="num-btn l" @click.stop="numAdd(index,cIndex)">+</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </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" class="skuStyle">
+              <label class="fs24 font-color-999">{{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="goodsNum-box flex-row-plus flex-sp-between" :class="{'bottom-line' :supportHuabei}">
+            <label class="font-color-999 fs24">数量</label>
+            <view class="goodsNum">
+              <text class="subtract" @click="updateNumSub()">-</text>
+              <text class="goodsNumber" v-model="buyNum">{{buyNum}}</text>
+              <text class="add" @click.stop="updateNumAdd()">+</text>
+            </view>
+          </view>
+          <view class="goosDetailbut-box flex-items-plus">
+            <button type="default" @click="goodsDateils(shopId,productId,skuId)" >查看详情</button>
+            <button type="default" class="submitBtn" @click="submitBtn()">确认</button>
+          </view>
+        </view>
+      </u-popup>
+
+      <!-- #ifdef H5 -->
+      <view class="cart-bottom-box-h5">
+        <!-- #endif -->
+        <!-- #ifndef H5 -->
+        <view class="cart-bottom-box-app">
+          <!-- #endif -->
+          <view class="cart-bottom">
+            <view class="left">
+              <image mode="aspectFill" v-if="isAllCheck" src="../../../static/images/selectActive.png"
+                     class="cart-select-img" @click="allSel(0)"></image>
+              <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
+                     class="cart-select-img" @click="allSel(1)"></image>
+              <text>全选</text>
+            </view>
+            <view class="right" v-if="btnType == 0">
+              <view class="price-box">
+                <text>合计：</text>
+                <text class="price">¥{{checkMoney}}</text>
+              </view>
+              <view class="btn-confirm" @click="settlementTap">结算（{{checkNum}}）</view>
+            </view>
+            <view class="right" v-if="btnType == 1">
+              <view class="btn-delete" @click="cartDel">删除</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 购物车为空 -->
+      <view v-else class="emptyCart-box flex-items-plus flex-column">
+        <image class="emptyCart-img" src="../../../static/images/cartEmpty.png"></image>
+        <label class="font-color-999 fs26 mar-top-30">你的购物车还没有宝贝哦</label>
+        <label class="font-color-999 fs26 mar-top-10">快去首页选一个吧～</label>
+        <view class="goToShopping" @click="goToShopping">去购物</view>
+      </view>
+      <!-- 删除确认弹窗 -->
+      <tui-modal :show="cardModal" :custom="true" :fadein="true">
+        <view class="Put-box1">
+          <view class="text-align fs34 fs-bold">
+            温馨提示
+          </view>
+          <view class="mar-top-40 text-align">
+            您确定删除选中的商品吗？
+          </view>
+          <view class="flex-display flex-sp-between">
+            <view class="btn" @click="cardModal = false">
+              点错了
+            </view>
+            <view class="btn submit" @click="doDelete">
+              确认删除
+            </view>
+          </view>
+        </view>
+      </tui-modal>
+    </view>
 </template>
 
 <script>
-	import tuiModal from "@/components/modal/modal";
-	const NET = require('../../../utils/request')
-	const API = require('../../../config/api')
-	export default {
-		components: {
-			tuiModal
-		},
-		data() {
-			return {
-				goodsDetailShowFlag: false,
-				OriginalSelectedSku: {},
-				selectedSku: {},
-				productData: [],
-				shopId: 0,
-				productId: 0,
-				skuId: 0,
-				selectedAttr: {},
-				supportHuabei: false,
-
-				title: 'Hello',
-				btnType: 0,
-				dataList: [],
-				goosDetailshowFlag: false,
-				colorActiveId: 1,
-				colorList: [{
-					id: 1,
-					color: '复古蓝色'
-				}, {
-					id: 2,
-					color: '马卡龙粉色'
-				}],
-				modelNumActiveId: 1,
-				modelNumList: [{
-					id: 1,
-					modelNum: '小号'
-				}, {
-					id: 2,
-					modelNum: '中号'
-				}, {
-					id: 3,
-					modelNum: '大号'
-				}],
-				skuItemList: [],
-				buyNum: 1,
-				allNum: 0,
-				checkNum: 0,
-				checkMoney: 0,
-				isAllCheck: true,
-				skuProdList: {},
-				item: {},
-				cardModal: false,
-        isEmpty: false
-			}
-		},
-		computed: {
-			// 计算显示tabBar购物车数量
-			getCartNum() {
-				let cartNum = 0
-				this.updateMoneyAndNum()
-				cartNum = this.allNum
-				if (cartNum > 0) {
-					uni.setTabBarBadge({
-						index: 2,
-						text: cartNum.toString()
-					})
-				} else {
-					uni.removeTabBarBadge({
-						index: 2
-					})
-				}
-				uni.setStorageSync('allCartNum', cartNum)
-				console.log(uni.getStorageSync('allCartNum'), '1111')
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-			//判断是否登录
-			/* let item = {}
-			if(uni.getStorageSync('storage_key')){
-				item = uni.getStorageSync('storage_key');
-			}
-			console.dir(item) */
-			/* if(JSON.stringify(item) == '{}'){
-				uni.navigateTo({
-					url:'../../../pages_category_page2/userModule/login'
-				})
-			}else{ */
-      this.isEmpty = false
-      this.dataList = []
-			this.getDataList()
-			/* } */
-		},
-		methods: {
-
-			// 提交更换商品规格
-			submitBtn() {
-				console.log(this.selectedSku.skuId,'this.selectedSku.skuId')
-				console.log(this.skuId,'this.skuId')
-				NET.request(API.UpdateSkuCart, {
-						skuId: this.skuId,
-						newSkuId: this.selectedSku.skuId,
-						number: this.buyNum
-					},
-					"POST").then(res => {
-					this.goodsDetailShowFlag = false
-					this.getDataList()
-
-				})
-
-			},
-
-			// 购物车修改属性样式时:数量减
-			updateNumSub() {
-				if (this.buyNum > 1) {
-					this.buyNum = this.buyNum - 1
-				} else {
-					uni.showToast({
-						title: '亲！至少一件哦！',
-						icon: "none"
-					})
-				}
-			},
-
-			// 购物车修改属性样式时:数量加
-			updateNumAdd() {
-				if (this.buyNum < this.selectedSku.stockNumber) {
-					this.buyNum = this.buyNum + 1
-				} else {
-					uni.showToast({
-						title: '库存不足！',
-						icon: "none"
-					})
-				}
-			},
-
-
-			//获取商品详情
-			queryProductDetail() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				NET.request(API.QueryProductDetail, {
-						shopId: this.shopId,
-						productId: this.productId,
-						skuId: this.skuId,
-						terminal: 1
-					},
-					"GET").then(res => {
-					uni.hideLoading()
-					this.productData = res.data
-
-					this.markTools = res.data.markTools //平台优惠券
-					this.shopMarkTools = res.data.shopMarkTools //店铺优惠券
-
-					//如果是单款式商品，需要特殊处理productData.names
-					const mapKeys = Object.keys(this.productData.map)
-					if (mapKeys.length === 1 && mapKeys[0] === '单款项') {
-						this.productData.names[0].values.push({
-							skuValue: '单款项',
-							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
-
-					//渲染商详之后，如果参数传了skuId，则选中该skuId，否则选中第一个规格
-					if (this.skuId) {
-						this.selectBySkuId(this.skuId)
-						console.log(this.skuId, 'this.skuId2222')
-					} else {
-						for (var attr in this.productData.names) {
-							this.nameCodeValueCodeClick(attr.nameCode, attr.values[0].valueCode, true)
-						}
-					}
-
-					this.beginTimer();
-				}).catch(res => {
-					uni.hideLoading()
-				})
-
-			},
-
-			selectBySkuId(skuId) {
-				if (skuId) {
-					let mapinfo = this.productData.map
-					for (var key in mapinfo) {
-						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)
-										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]
-						}
-					}
-				}
-
-				// 选中sku之后，做一些相应的操作
-				// this.selectSkuPostProcessor()
-
-				this.$forceUpdate(); // 重绘
-			},
-
-			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
-			},
-
-			// 更换商品样式
-			changeSkuItemValue(skuItem, shopId) {
-				this.OriginalSelectedSku = skuItem
-				this.shopId = shopId
-				this.productId = skuItem.productId
-				this.skuId = skuItem.skuId
-				this.buyNum = this.OriginalSelectedSku.number
-				this.queryProductDetail()
-				setTimeout(() => {
-					this.goodsDetailShowFlag = true
-				}, 1000)
-			},
-			//逛店铺
-			goStore(index) {
-				uni.navigateTo({
-					url: '../../../pages_category_page1/store/index?storeId=' + this.dataList[index].shopId
-				})
-			},
-			//商品详情
-			goodsDateils(shopId, productId, skuId) {
-				uni.navigateTo({
-					url: '../../../pages_category_page1/goodsModule/goodsDetails?shopId=' + shopId +
-						'&productId=' + productId + '&skuId=' + skuId
-				})
-			},
-			// 去首页
-			goToShopping() {
-				uni.switchTab({
-					url: '../../../pages/tabbar/index/index'
-				})
-			},
-			btnTypeClick(type) {
-				this.btnType = type
-			},
-			getDataList() {
-				wx.showLoading({
-					title: '加载中...',
-				})
-				NET.request(API.ShoppingCart, {}, 'GET').then(res => {
-					wx.hideLoading()
-					this.dataList = res.data
-					this.dataList.forEach((item) => {
-						for (let i = 0; i < item.skus.length; i++) {
-							if (item.skus[i].shelveState === 0) {
-								item.skus.splice(i, 1)
-							}
-						}
-					})
-          // this.dataList.forEach((item) => {
-          //   for (let i = 0; i < item.skus.length; i++) {
-          //     for (let j = 0; j < item.skus[i].map.length; j++) {
-          //       if (item.skus[i].map[j].skuId === item.skus.skuId) {}
-          //     }
-          //   }
-          // })
-					this.allNum = this.dataList.length
-          if (this.dataList.length === 0) {
-            this.isEmpty = true
+import tuiModal from "@/components/modal/modal";
+import api from "../../../components/canvasShow/config/api";
+const NET = require('../../../utils/request')
+const API = require('../../../config/api')
+export default {
+  components: {
+    tuiModal
+  },
+  data() {
+    return {
+      goodsDetailShowFlag: false,
+      OriginalSelectedSku: {},
+      selectedSku: {},
+      productData: [],
+      shopId: 0,
+      productId: 0,
+      skuId: 0,
+      selectedAttr: {},
+      supportHuabei: false,
+
+      title: 'Hello',
+      btnType: 0,
+      dataList: [],
+      goosDetailshowFlag: false,
+      colorActiveId: 1,
+      colorList: [{
+        id: 1,
+        color: '复古蓝色'
+      }, {
+        id: 2,
+        color: '马卡龙粉色'
+      }],
+      modelNumActiveId: 1,
+      modelNumList: [{
+        id: 1,
+        modelNum: '小号'
+      }, {
+        id: 2,
+        modelNum: '中号'
+      }, {
+        id: 3,
+        modelNum: '大号'
+      }],
+      skuItemList: [],
+      buyNum: 1,
+      allNum: 0,
+      checkNum: 0,
+      checkMoney: 0,
+      isAllCheck: true,
+      skuProdList: {},
+      item: {},
+      cardModal: false,
+      isEmpty: false
+    }
+  },
+  computed: {
+    // 计算显示tabBar购物车数量
+    getCartNum() {
+      let cartNum = 0
+      this.updateMoneyAndNum()
+      cartNum = this.allNum
+      if (cartNum > 0) {
+        uni.setTabBarBadge({
+          index: 2,
+          text: cartNum.toString()
+        })
+      } else {
+        uni.removeTabBarBadge({
+          index: 2
+        })
+      }
+      uni.setStorageSync('allCartNum', cartNum)
+      console.log(uni.getStorageSync('allCartNum'), '1111')
+    }
+  },
+  onLoad() {
+
+  },
+  onShow() {
+    //判断是否登录
+    /* let item = {}
+    if(uni.getStorageSync('storage_key')){
+      item = uni.getStorageSync('storage_key');
+    }
+    console.dir(item) */
+    /* if(JSON.stringify(item) == '{}'){
+      uni.navigateTo({
+        url:'../../../pages_category_page2/userModule/login'
+      })
+    }else{ */
+    this.isEmpty = false
+    this.dataList = []
+    this.getDataList()
+    /* } */
+  },
+  methods: {
+
+    // 提交更换商品规格
+    submitBtn() {
+      console.log(this.selectedSku.skuId,'this.selectedSku.skuId')
+      console.log(this.skuId,'this.skuId')
+      NET.request(API.UpdateSkuCart, {
+            skuId: this.skuId,
+            newSkuId: this.selectedSku.skuId,
+            number: this.buyNum
+          },
+          "POST").then(res => {
+        this.goodsDetailShowFlag = false
+        this.getDataList()
+      })
+    },
+
+    // 购物车修改属性样式时:数量减
+    updateNumSub() {
+      if (this.buyNum > 1) {
+        this.buyNum = this.buyNum - 1
+      } else {
+        uni.showToast({
+          title: '亲！至少一件哦！',
+          icon: "none"
+        })
+      }
+    },
+    // 获取匹配组合定价价格
+    getData(item, index) {
+      if (item.ids) {
+        console.log(item.ids, 'ids')
+        NET.request(api.getPrices, {
+          shopId: item.shopId,
+          ids: item.ids,
+          page: 1,
+          pageSize: 10
+        }, 'GET').then(res => {
+          let rules = []
+          rules = res.data
+          this.dataList[index].rules = rules[0].rules
+          for (let i = 0; i < this.dataList[index].rules.length; i++) {
+            // console.log(this.dataList[index].rules[i].number, this.dataList[index].priceNumber, 'fsdfsdfsdfs')
+            if (this.dataList[index].rules[i].number === this.dataList[index].priceNumber) {
+              this.dataList[index].currentRules = this.dataList[index].rules[i]
+              console.log(this.dataList[index].currentRules, '==', this.dataList[index].rules[i])
+              this.$forceUpdate()
+              break
+            } else if (this.dataList[index].rules[this.dataList[index].rules.length - 1].number < this.dataList[index].priceNumber) {
+              this.dataList[index].currentRules = this.dataList[index].rules[this.dataList[index].rules.length - 1]
+              this.$forceUpdate()
+              break
+            }
           }
-					this.updateMoneyAndNum()
-				}).catch(res => {
-					wx.hideLoading()
-				})
-			},
-			// 数量减
-			numSub(index, cIndex) {
-				if (this.dataList[index].skus[cIndex].number > 1) {
-					this.dataList[index].skus[cIndex].number = this.dataList[index].skus[cIndex].number - 1
-					this.updateCart(this.dataList[index].skus[cIndex].skuId, this.dataList[index].skus[cIndex].number)
-				} else {
-					uni.showToast({
-						title: '亲！至少一件哦！',
-						icon: "none"
-					})
-				}
-			},
-			// 数量加
-			numAdd(index, cIndex) {
-				console.log('点击')
-				if (this.dataList[index].skus[cIndex].number <= 100) {
-					this.dataList[index].skus[cIndex].number = this.dataList[index].skus[cIndex].number + 1
-					this.updateCart(this.dataList[index].skus[cIndex].skuId, this.dataList[index].skus[cIndex].number)
-				} else {
-					wx.showToast({
-						title: '库存不足！',
-						icon: 'none'
-					})
-				}
-			},
-			updateMoneyAndNum() {
-				this.isAllCheck = true
-				this.allNum = 0
-				this.checkNum = 0
-				this.checkMoney = 0
-				let len = this.dataList.length
-				for (let i = 0; i < len; i++) {
-					let len2 = this.dataList[i].skus.length
-					for (let j = 0; j < len2; j++) {
-						let item = this.dataList[i].skus[j]
-						this.allNum += item.number
-						if (item.selected == 1) {
-							this.checkNum++
-							this.checkMoney += parseFloat(item.price * item.number)
-						} else {
-							if (this.isAllCheck) {
-								this.isAllCheck = false
-							}
-						}
-					}
-				}
-				this.checkMoney = parseFloat(this.checkMoney.toFixed(10))
-				uni.setStorageSync('allCartNum', this.allNum)
-				if (this.allNum > 0) {
-					uni.setTabBarBadge({
-						index: 2,
-						text: (this.allNum).toString()
-					})
-				} else {
-					uni.removeTabBarBadge({
-						index: 2
-					})
-				}
-			},
-			updateShopSel(index, type) {
-        console.log(index, 'index', type, 'type')
-        console.log(this.dataList, 'dataList')
-				let shopCarts = [{
-					shopId: '',
-					skus: []
-				}]
-				this.dataList[index].selected = type
-				let len = this.dataList[index].skus.length
-				for (let i = 0; i < len; i++) {
-					this.dataList[index].skus[i].selected = type
-					var skusobj = {};
-					skusobj["skuId"] = this.dataList[index].skus[i].skuId;
-					skusobj["selected"] = this.dataList[index].skus[i].selected
-					shopCarts[0].skus.push(skusobj);
-				}
-				shopCarts[0].shopId = this.dataList[index].shopId
-
-				this.updateSelected(shopCarts)
-			},
-			//选中商品
-			updateSelected(shopCarts) {
-				this.updateMoneyAndNum()
-				NET.request(API.SelectedCart, {
-					shopCarts
-				}, 'POST').then(res => {}).catch(res => {
-
-				})
-			},
-			updateCart(skuId, number) {
-				NET.request(API.UpdateNumberCart, {
-					skuId: skuId,
-					number: number
-				}, 'POST').then(res => {
-					this.updateMoneyAndNum()
-				}).catch(res => {
-
-				})
-			},
-			cartItemSel(index, cIndex, type) {
-				let shopCarts = [{
-					shopId: 0,
-					skus: []
-				}]
-				this.dataList[index].skus[cIndex].selected = type
-				if (type == 1) {
-					let len = this.dataList[index].skus.length
-					let shopType = 1
-					for (let i = 0; i < len; i++) {
-						if (this.dataList[index].skus[i].selected == 0) {
-							shopType = 0
-							break
-						}
-					}
-					this.dataList[index].selected = shopType
-				} else {
-					this.dataList[index].selected = type
-				}
-
-				shopCarts[0].shopId = this.dataList[index].shopId
-				var skusobj = {};
-				skusobj["skuId"] = this.dataList[index].skus[cIndex].skuId;
-				skusobj["selected"] = this.dataList[index].skus[cIndex].selected
-				shopCarts[0].skus.push(skusobj);
-				this.updateSelected(shopCarts)
-			},
-			//全选
-			allSel(type) {
-				this.updateAllSel(type)
-			},
-			updateAllSel(type) {
-				let len = this.dataList.length
-				for (let i = 0; i < len; i++) {
-					let len2 = this.dataList[i].skus.length
-					this.dataList[i].selected = type
-					for (let j = 0; j < len2; j++) {
-						this.dataList[i].skus[j].selected = type
-					}
-				}
-				let shopCarts = []
-				this.updateSelected(shopCarts)
-			},
-			//点击删除
-			cartDel() {
-				if (!this.checkNum) {
-					uni.showToast({
-						title: '请先选择对应商品',
-						icon: 'none'
-					})
-					return;
-				}
-				this.cardModal = true
-			},
-			//删除购物车
-			doDelete() {
-				this.cardModal = false
-				let cartList = []
-				let n = 0
-				let skus = []
-				let len = this.dataList.length
-				for (let i = 0; i < len; i++) {
-					let item = {}
-					let len2 = this.dataList[i].skus.length
-
-					for (let j = 0; j < len2; j++) {
-						let itemGoods = this.dataList[i].skus[j]
-						if (itemGoods.selected == 1) {
-							skus[n] = itemGoods.skuId
-							n = n + 1
-						}
-					}
-				}
-				NET.request(API.DeleteCart, {
-					ids: skus
-				}, 'POST').then(res => {
-					this.getDataList()
-
-				}).catch(res => {
-
-				})
-
-			},
-			//结算购物车
-			settlementTap() {
-				if (!this.checkNum) {
-					wx.showToast({
-						title: '请先选择对应商品',
-						icon: 'none'
-					})
-					return;
-				}
-				console.log(this.dataList, 222)
-				let addCart = []
-				let len = this.dataList.length
-				for (let i = 0; i < len; i++) {
-					let shopObj = {}
-					shopObj["shopId"] = this.dataList[i].shopId
-					shopObj["skus"] = []
-					let len2 = this.dataList[i].skus.length
-					for (let j = 0; j < len2; j++) {
-						let skusObj = {}
-						skusObj["ifLogistics"] = this.dataList[i].skus[j].ifLogistics
-						skusObj["number"] = this.dataList[i].skus[j].number
-						skusObj["selected"] = this.dataList[i].skus[j].selected
-						skusObj["skuId"] = this.dataList[i].skus[j].skuId
-						shopObj.skus.push(skusObj)
-					}
-					addCart.push(shopObj)
-				}
-				let newArray = []
-				addCart.forEach((item, index) => {
-					newArray[index] = item
-					newArray[index].skus = item.skus.filter((item) => {
-						return item.selected == 1
-					})
-					if (item.skus.length == 0) {
-						newArray.splice(index, 1);
-					}
-				})
-				newArray = newArray.filter(d => d)
-				uni.setStorageSync('skuItemDTOList', newArray)
-				uni.navigateTo({
-					url: '../../../pages_category_page1/orderModule/orderConfirm?type=2'
-				})
-			},
-			//商品尺寸弹窗
-			goosDetailshowClick(storeId, skuItemId) {
-				this.goosDetailshowFlag = true
-				this.colorActiveClick(storeId, skuItemId)
-			},
-			//颜色选中事件
-			colorActiveClick(storeId, attrItemId) {
-				this.colorActiveId = attrItemId
-				NET.request(API.QueryProductSku, {
-					productId: storeId,
-					skuValueIdList: [attrItemId]
-				}, 'POST').then(res => {
-					if (res.code === 0) {
-						this.skuProdList = res.data
-						this.skuProdId = res.data.id
-						this.skuImg = res.data.skuImg
-						this.skuNameStr = res.data.skuNameStr
-						this.skuPrice = res.data.skuPrice
-					}
-
-				}).catch(res => {
-
-				})
-			},
-		}
-	}
+        }).catch(res => {
+        })
+      }
+    },
+    // 购物车修改属性样式时:数量加
+    updateNumAdd() {
+      if (this.buyNum < this.selectedSku.stockNumber) {
+        this.buyNum = this.buyNum + 1
+      } else {
+        uni.showToast({
+          title: '库存不足！',
+          icon: "none"
+        })
+      }
+    },
+
+
+    //获取商品详情
+    queryProductDetail() {
+      uni.showLoading({
+        title: '加载中...'
+      })
+      NET.request(API.QueryProductDetail, {
+            shopId: this.shopId,
+            productId: this.productId,
+            skuId: this.skuId,
+            terminal: 1
+          },
+          "GET").then(res => {
+        uni.hideLoading()
+        this.productData = res.data
+
+        this.markTools = res.data.markTools //平台优惠券
+        this.shopMarkTools = res.data.shopMarkTools //店铺优惠券
+
+        //如果是单款式商品，需要特殊处理productData.names
+        const mapKeys = Object.keys(this.productData.map)
+        if (mapKeys.length === 1 && mapKeys[0] === '单款项') {
+          this.productData.names[0].values.push({
+            skuValue: '单款项',
+            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
+
+        //渲染商详之后，如果参数传了skuId，则选中该skuId，否则选中第一个规格
+        if (this.skuId) {
+          this.selectBySkuId(this.skuId)
+          console.log(this.skuId, 'this.skuId2222')
+        } else {
+          for (var attr in this.productData.names) {
+            this.nameCodeValueCodeClick(attr.nameCode, attr.values[0].valueCode, true)
+          }
+        }
+
+        this.beginTimer();
+      }).catch(res => {
+        uni.hideLoading()
+      })
+
+    },
+
+    selectBySkuId(skuId) {
+      if (skuId) {
+        let mapinfo = this.productData.map
+        for (var key in mapinfo) {
+          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)
+                  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]
+          }
+        }
+      }
+
+      // 选中sku之后，做一些相应的操作
+      // this.selectSkuPostProcessor()
+
+      this.$forceUpdate(); // 重绘
+    },
+
+    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
+    },
+
+    // 更换商品样式
+    changeSkuItemValue(skuItem, shopId) {
+      this.OriginalSelectedSku = skuItem
+      this.shopId = shopId
+      this.productId = skuItem.productId
+      this.skuId = skuItem.skuId
+      this.buyNum = this.OriginalSelectedSku.number
+      this.queryProductDetail()
+      setTimeout(() => {
+        this.goodsDetailShowFlag = true
+      }, 1000)
+    },
+    //逛店铺
+    goStore(index) {
+      uni.navigateTo({
+        url: '../../../pages_category_page1/store/index?storeId=' + this.dataList[index].shopId
+      })
+    },
+    //商品详情
+    goodsDateils(shopId, productId, skuId) {
+      uni.navigateTo({
+        url: '../../../pages_category_page1/goodsModule/goodsDetails?shopId=' + shopId +
+            '&productId=' + productId + '&skuId=' + skuId
+      })
+    },
+    // 去首页
+    goToShopping() {
+      uni.switchTab({
+        url: '../../../pages/tabbar/index/index'
+      })
+    },
+    btnTypeClick(type) {
+      this.btnType = type
+    },
+    getDataList() {
+      uni.showLoading({
+        title: '加载中...',
+      })
+      NET.request(API.ShoppingCart, {}, 'GET').then(res => {
+        uni.hideLoading()
+        this.dataList = res.data
+        this.updateMoneyAndNum()
+        this.allNum = this.dataList.length
+        if (this.dataList.length === 0) {
+          this.isEmpty = true
+        }
+        let recheck = false
+        this.dataList.forEach((item, index) => {
+          item['currentIds'] = []
+          item['priceNumber'] = 0
+          item['rules'] = []
+          item['currentRules'] = {}
+          item['ids'] = 0
+          for (let i = item.skus.length-1; i >= 0; i--) {
+            if (item.skus[i].shelveState === 0) {
+              item.skus.splice(i, 1)
+              if(item.skus.length === 0){
+                recheck = true
+              }
+            } else {
+              if (item.skus[i].activityType === 6 && item.skus[i].selected === 1){
+                item.currentIds.push(item.skus[i].priceId)
+                item.priceNumber += item.skus[i].number
+              }
+            }
+          }
+          for (let i = 0; i < item.skus.length; i++) {
+            if (item.skus[i].activityType === 6) {
+              item.ids = item.skus[i].priceId
+              break
+            }
+          }
+          this.getData(item, index)
+        })
+        // 重新检查是不是全为空
+        if(recheck){
+          let isEmpty = true
+          this.dataList.forEach((item, index) => {
+            if(item.skus.length !== 0){
+              isEmpty = false
+            }
+          })
+          this.isEmpty = isEmpty
+        }
+      }).catch(res => {
+        wx.hideLoading()
+      })
+    },
+    // 数量减
+    numSub(index, cIndex) {
+      this.dataList[index].priceNumber = 0
+      if (this.dataList[index].skus[cIndex].number > 1) {
+        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 {
+        uni.showToast({
+          title: '亲！至少一件哦！',
+          icon: "none"
+        })
+      }
+    },
+    // 数量加
+    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 {
+        wx.showToast({
+          title: '库存不足！',
+          icon: 'none'
+        })
+      }
+    },
+    updateMoneyAndNum() {
+      console.log('test111')
+      this.isAllCheck = true
+      this.allNum = 0
+      this.checkNum = 0
+      this.checkMoney = 0
+      let len = this.dataList.length
+      for (let i = 0; i < len; i++) {
+        let len2 = this.dataList[i].skus.length
+        for (let j = 0; j < len2; j++) {
+          let item = this.dataList[i].skus[j]
+          this.allNum += item.number
+          if (item.selected == 1) {
+            this.checkNum++
+            this.checkMoney += parseFloat(item.price * item.number)
+          } else {
+            if (this.isAllCheck) {
+              this.isAllCheck = false
+            }
+          }
+        }
+      }
+      this.checkMoney = parseFloat(this.checkMoney.toFixed(10))
+      uni.setStorageSync('allCartNum', this.allNum)
+      if (this.allNum > 0) {
+        uni.setTabBarBadge({
+          index: 2,
+          text: (this.allNum).toString()
+        })
+      } else {
+        uni.removeTabBarBadge({
+          index: 2
+        })
+      }
+    },
+    updateShopSel(index, type) {
+      this.dataList[index].currentRules = {}
+      this.dataList[index].priceNumber = null
+      console.log(index, 'index', type, 'type')
+      let shopCarts = [{
+        shopId: '',
+        skus: []
+      }]
+      this.dataList[index].selected = type
+      let len = this.dataList[index].skus.length
+      for (let i = 0; i < len; i++) {
+        this.dataList[index].skus[i].selected = type
+        var skusobj = {};
+        skusobj["skuId"] = this.dataList[index].skus[i].skuId;
+        skusobj["selected"] = this.dataList[index].skus[i].selected
+        shopCarts[0].skus.push(skusobj);
+      }
+      shopCarts[0].shopId = this.dataList[index].shopId
+      this.priceFn(index)
+      this.updateSelected(shopCarts)
+      this.$forceUpdate()
+    },
+    //选中商品
+    updateSelected(shopCarts) {
+      this.updateMoneyAndNum()
+      NET.request(API.SelectedCart, {
+        shopCarts
+      }, 'POST').then(res => {}).catch(res => {
+
+      })
+    },
+    updateCart(skuId, number) {
+      NET.request(API.UpdateNumberCart, {
+        skuId: skuId,
+        number: number
+      }, 'POST').then(res => {
+        this.updateMoneyAndNum()
+      }).catch(res => {
+
+      })
+    },
+    cartItemSel(index, cIndex, type) {
+      this.dataList[index].currentRules = {}
+      this.dataList[index].priceNumber = 0
+      let shopCarts = [{
+        shopId: 0,
+        skus: []
+      }]
+      this.dataList[index].skus[cIndex].selected = type
+      if (type == 1) {
+        let len = this.dataList[index].skus.length
+        let shopType = 1
+        for (let i = 0; i < len; i++) {
+          if (this.dataList[index].skus[i].selected == 0) {
+            shopType = 0
+            break
+          }
+        }
+        this.dataList[index].selected = shopType
+      } else {
+        this.dataList[index].selected = type
+      }
+      this.priceFn(index)
+      shopCarts[0].shopId = this.dataList[index].shopId
+      var skusobj = {};
+      skusobj["skuId"] = this.dataList[index].skus[cIndex].skuId;
+      skusobj["selected"] = this.dataList[index].skus[cIndex].selected;
+      shopCarts[0].skus.push(skusobj);
+      this.updateSelected(shopCarts)
+    },
+    // 组合定价
+    priceFn(shopIndex) {
+      this.dataList[shopIndex].currentRules = {}
+      this.dataList[shopIndex].skus.forEach((item) => {
+        if (item.activityType === 6 && item.selected === 1) {
+          this.dataList[shopIndex].priceNumber += item.number
+        }
+      })
+      for (let i = 0; i < this.dataList[shopIndex].rules.length; i++) {
+        if (this.dataList[shopIndex].rules[i].number === this.dataList[shopIndex].priceNumber) {
+          this.dataList[shopIndex].currentRules = this.dataList[shopIndex].rules[i]
+          console.log(this.dataList[shopIndex].currentRules, '==', this.dataList[shopIndex].rules[i])
+          this.$forceUpdate()
+          break
+        } else if (this.dataList[shopIndex].rules[this.dataList[shopIndex].rules.length - 1].number < this.dataList[shopIndex].priceNumber) {
+          this.dataList[shopIndex].currentRules = this.dataList[shopIndex].rules[this.dataList[shopIndex].rules.length - 1]
+          this.$forceUpdate()
+          break
+        }
+      }
+    },
+    //全选
+    allSel(type) {
+      this.updateAllSel(type)
+    },
+    updateAllSel(type) {
+      console.log(type, 'type')
+      let len = this.dataList.length
+      for (let i = 0; i < len; i++) {
+        let len2 = this.dataList[i].skus.length
+        this.dataList[i].selected = type
+        let priceNum = 0
+        for (let j = 0; j < len2; j++) {
+          this.dataList[i].skus[j].selected = type
+          if (this.dataList[i].skus[j].selected === 1 && this.dataList[i].skus[j].activityType === 6) {
+            priceNum += this.dataList[i].skus[j].number
+          }
+        }
+        this.dataList[i].priceNumber = priceNum
+        this.dataList[i].rules.forEach((item => {
+          if (item.number <= this.dataList[i].priceNumber) {
+            this.dataList[i].currentRules = item
+            console.log(this.dataList[i].currentRules, 'currentRules')
+          }
+        }))
+      }
+      if (type === 0) {
+        this.dataList.forEach((item) => {
+          item.currentRules = {}
+        })
+      }
+      let shopCarts = []
+      this.updateSelected(shopCarts)
+    },
+    //点击删除
+    cartDel() {
+      if (!this.checkNum) {
+        uni.showToast({
+          title: '请先选择对应商品',
+          icon: 'none'
+        })
+        return;
+      }
+      this.cardModal = true
+    },
+    //删除购物车
+    doDelete() {
+      this.cardModal = false
+      let cartList = []
+      let n = 0
+      let skus = []
+      let len = this.dataList.length
+      for (let i = 0; i < len; i++) {
+        let item = {}
+        let len2 = this.dataList[i].skus.length
+
+        for (let j = 0; j < len2; j++) {
+          let itemGoods = this.dataList[i].skus[j]
+          if (itemGoods.selected == 1) {
+            skus[n] = itemGoods.skuId
+            n = n + 1
+          }
+        }
+      }
+      NET.request(API.DeleteCart, {
+        ids: skus
+      }, 'POST').then(res => {
+        this.getDataList()
+
+      }).catch(res => {
+
+      })
+
+    },
+    //结算购物车
+    settlementTap() {
+      if (!this.checkNum) {
+        wx.showToast({
+          title: '请先选择对应商品',
+          icon: 'none'
+        })
+        return;
+      }
+      let addCart = []
+      let len = this.dataList.length
+      for (let i = 0; i < len; i++) {
+        let shopObj = {}
+        shopObj["shopId"] = this.dataList[i].shopId
+        shopObj["skus"] = []
+        let len2 = this.dataList[i].skus.length
+        for (let j = 0; j < len2; j++) {
+          let skusObj = {}
+          skusObj["ifLogistics"] = this.dataList[i].skus[j].ifLogistics
+          skusObj["number"] = this.dataList[i].skus[j].number
+          skusObj["selected"] = this.dataList[i].skus[j].selected
+          skusObj["skuId"] = this.dataList[i].skus[j].skuId
+          shopObj.skus.push(skusObj)
+        }
+        addCart.push(shopObj)
+      }
+      let newArray = []
+      addCart.forEach((item, index) => {
+        newArray[index] = item
+        newArray[index].skus = item.skus.filter((item) => {
+          return item.selected == 1
+        })
+        if (item.skus.length == 0) {
+          newArray.splice(index, 1);
+        }
+      })
+      newArray = newArray.filter(d => d)
+      uni.setStorageSync('skuItemDTOList', newArray)
+      uni.navigateTo({
+        url: '../../../pages_category_page1/orderModule/orderConfirm?type=2'
+      })
+    },
+    //商品尺寸弹窗
+    goosDetailshowClick(storeId, skuItemId) {
+      this.goosDetailshowFlag = true
+      this.colorActiveClick(storeId, skuItemId)
+    },
+    //颜色选中事件
+    colorActiveClick(storeId, attrItemId) {
+      this.colorActiveId = attrItemId
+      NET.request(API.QueryProductSku, {
+        productId: storeId,
+        skuValueIdList: [attrItemId]
+      }, 'POST').then(res => {
+        if (res.code === 0) {
+          this.skuProdList = res.data
+          this.skuProdId = res.data.id
+          this.skuImg = res.data.skuImg
+          this.skuNameStr = res.data.skuNameStr
+          this.skuPrice = res.data.skuPrice
+        }
+
+      }).catch(res => {
+
+      })
+    },
+  }
+}
 </script>
 
 <style lang="scss">
-	page {
-		// background: #f7f7f7;
-	}
-
-	.content {
-		padding: 0 0 110rpx;
-		overflow: hidden;
-
-		.goosDetailshow-box {
-			.detailImg-box {
-				margin-top: 30upx;
-				margin-left: 30upx;
-				border-radius: 10upx;
-				border-bottom: 1upx solid #EDEDED;
-				padding-bottom: 20upx;
-				width: 690upx;
-
-				.detailImg {
-					width: 180upx;
-					height: 180upx;
-				}
-			}
-
-			.color-box {
-				padding: 30upx 30upx;
-				border-bottom: 1upx solid #EDEDED;
-				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;
-					}
-				}
-			}
-
-			.goodsNum-box {
-				padding: 30upx 30upx;
-				width: 690upx;
-				padding-bottom: 140upx;
-
-				.goodsNum {
-					height: 50upx;
-
-					text {
-						display: inline-block;
-						width: 50upx;
-						height: 50upx;
-						border: 1upx solid #999999;
-						text-align: center;
-						// line-height: 50upx;
-					}
-
-					.subtract {
-						border-right: 0upx;
-					}
-
-					.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;
-				margin-bottom: 48rpx;
-
-				button {
-					width: 342rpx;
-					height: 100rpx;
-					line-height: 100rpx;
-					font-size: 28rpx;
-					border: 1px solid;
-					border-radius: 0;
-				}
-
-				.submitBtn {
-					color: #FFEBC4;
-					background: #333333;
-				}
-
-
-			}
-		}
-
-		.Put-box1 {
-			.btn {
-				text-align: center;
-				margin-top: 40rpx;
-				border: 1px solid #333333;
-				height: 80upx;
-				line-height: 80upx;
-				width: 240upx;
-				color: #333333;
-			}
-
-			.submit {
-				background-color: #333333;
-				color: #FFEBC4;
-			}
-		}
-
-		.cart-bg {
-			width: 100%;
-			height: 180rpx;
-
-			.cart-num-box {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: space-between;
-
-				image {
-					width: 286rpx;
-					height: 72rpx;
-				}
-
-				.btn-box {
-					font-size: 30rpx;
-					color: #333333;
-					padding: 30rpx;
-					box-sizing: border-box;
-					display: inline-block;
-				}
-			}
-
-			.num-box {
-				padding: 30rpx 0 30rpx 30rpx;
-				box-sizing: border-box;
-				font-size: 30rpx;
-				color: #C5CACF;
-			}
-		}
-
-		.cart-list-box {
-			box-sizing: border-box;
-
-			.item {
-				background: #fff;
-				border-radius: 10rpx;
-				margin-bottom: 20rpx;
-
-				.shop-box {
-					display: flex;
-					flex-direction: row;
-					align-items: center;
-					border-bottom: 1px solid #eee;
-					border-top: 1px solid #eee;
-					position: relative;
-
-					.cart-select-img {
-						width: 40rpx;
-						height: 40rpx;
-						margin: 30rpx;
-						box-sizing: border-box;
-					}
-
-					.shop-name-box {
-						display: flex;
-						flex-direction: row;
-						align-items: center;
-
-						.shop-img {
-							width: 36rpx;
-							height: 36rpx;
-							margin-right: 10rpx;
-						}
-
-						.shop-name {
-							font-size: 30rpx;
-							color: #333;
-							font-weight: bold;
-							display: inline-block;
-							margin-left: 10rpx;
-						}
-
-						.arrow-right-img {
-							width: 30rpx;
-							height: 30rpx;
-							box-sizing: border-box;
-							margin-left: 30rpx;
-							position: absolute;
-							right: 30rpx;
-						}
-					}
-				}
-
-				.product-list-box {
-					.pro-item {
-						display: flex;
-						flex-direction: row;
-						align-items: center;
-
-						.cart-select-img {
-							width: 40rpx;
-							height: 40rpx;
-							margin: 30rpx;
-							box-sizing: border-box;
-						}
-
-						.pro-r {
-							flex: 1;
-							border-bottom: 1px solid #eee;
-							display: flex;
-							flex-direction: row;
-							padding: 30rpx 30rpx 30rpx 0;
-							box-sizing: border-box;
-							overflow: hidden;
-
-							.pro-img {
-								width: 180rpx;
-								height: 180rpx;
-								border-radius: 10rpx;
-								margin-right: 30rpx;
-							}
-
-							.pro-r-r {
-								flex: 1;
-								font-size: 26rpx;
-								color: #333;
-								overflow: hidden;
-								display: flex;
-								flex-direction: column;
-								justify-content: space-between;
-
-								.pro-name {
-									height: 66rpx;
-									line-height: 33rpx;
-									display: -webkit-box;
-									overflow: hidden;
-									text-overflow: ellipsis;
-									word-break: break-all;
-									-webkit-box-orient: vertical;
-									-webkit-line-clamp: 2;
-								}
-
-								.sku-box {
-									width: auto;
-									display: inline;
-									height: 40rpx;
-									border-radius: 4rpx;
-									padding: 0 0 0 10rpx;
-									box-sizing: border-box;
-									font-size: 24rpx;
-									color: #999;
-
-									text {
-										border: 2rpx solid #E4E5E6;
-										padding: 2rpx 10rpx;
-									}
-								}
-
-								.pro-price-num-box {
-									display: flex;
-									flex-direction: row;
-									align-items: center;
-									justify-content: space-between;
-
-									.pro-price-box {
-										font-size: 36rpx;
-										color: #333333;
-										font-weight: 400;
-
-										.fuhao {
-											font-size: 24rpx;
-										}
-									}
-
-									.pro-num-box {
-										width: 140rpx;
-										height: 40rpx;
-										border: 1px solid #ddd;
-										border-radius: 4rpx;
-										display: flex;
-										flex-direction: row;
-										justify-content: space-between;
-
-										.num-btn {
-											font-size: 34rpx;
-											color: #999999;
-											display: inline-block;
-											width: 40rpx;
-											text-align: center;
-											line-height: 32rpx;
-											height: 40rpx;
-										}
-
-										.num-btn.r {
-											border-right: 1px solid #ddd;
-										}
-
-										.num-btn.l {
-											border-left: 1px solid #ddd;
-										}
-
-										.num {
-											font-size: 26rpx;
-											color: #333;
-										}
-									}
-								}
-							}
-						}
-					}
-
-					.pro-item:last-of-type .pro-r {
-						border-bottom: none;
-					}
-				}
-			}
-		}
-
-		.emptyCart-box {
-			margin-top: 70rpx;
-
-			.emptyCart-img {
-				width: 216rpx;
-				height: 156rpx;
-			}
-
-			.goToShopping {
-				width: 282rpx;
-				height: 84rpx;
-				line-height: 84rpx;
-				text-align: center;
-				background: #333333;
-				margin-top: 40rpx;
-				color: #FFEBC4;
-				font-size: 28rpx;
-			}
-		}
-
-		.cart-bottom-box-h5 {
-			position: fixed;
-			bottom: 100rpx;
-			width: 100%;
-		}
-
-		.cart-bottom-box-app {
-			position: fixed;
-			bottom: 0rpx;
-			width: 100%;
-		}
-
-		.cart-bottom {
-			height: 120rpx;
-			background: #fff;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			border-top: 1rpx solid #eee;
-		}
-
-		.left {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			font-size: 28rpx;
-			color: #666;
-
-			.cart-select-img {
-				width: 40rpx;
-				height: 40rpx;
-				margin: 30rpx;
-				box-sizing: border-box;
-			}
-		}
-
-		.right {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			box-sizing: border-box;
-
-			.price-box {
-				font-size: 30rpx;
-				color: #333;
-
-				.price {
-					font-size: 40rpx;
-					color: #C83732;
-					font-weight: bold;
-				}
-			}
-
-			.btn-confirm {
-				width: 232rpx;
-				height: 120rpx;
-				background: #333333;
-				margin-left: 18rpx;
-				text-align: center;
-				line-height: 120rpx;
-				font-size: 28rpx;
-				color: #FFEBC4;
-			}
-
-			.btn-delete {
-				width: 232rpx;
-				height: 120rpx;
-				line-height: 120rpx;
-				text-align: center;
-				font-size: 28rpx;
-				color: #FFFFFF;
-				background: #C83732;
-			}
-		}
-
-		.goosDetailshow-box {
-			.detailImg-box {
-				margin-top: 30rpx;
-				margin-left: 30rpx;
-				border-radius: 10rpx;
-				border-bottom: 1rpx solid #EDEDED;
-				padding-bottom: 20rpx;
-				width: 690rpx;
-
-				.detailImg {
-					width: 180rpx;
-					height: 180rpx;
-				}
-			}
-
-			.color-box {
-				padding: 30rpx 30rpx;
-				border-bottom: 1rpx solid #EDEDED;
-				width: 690rpx;
-				.skuStyle{
-					padding: 20rpx 0;
-				}
-
-				.skuStyle:nth-child(2) {
-					border-top: 1px solid #F3F4F5;
-				}
-
-				.colorName-box {
-					display: flex;
-					flex-wrap: wrap;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 30rpx;
-					margin-left: -30rpx;
-
-					.colorName-on {
-						background-color: #FFE5D0;
-						color: #C5AA7B;
-						margin-left: 30rpx;
-						padding: 10rpx 32rpx;
-						border-radius: 28rpx;
-						border: 1rpx solid #C5AA7B;
-						font-size: 26rpx;
-						text-align: center;
-						z-index: 1;
-					}
-
-					.colorName {
-						background-color: #F5F5F5;
-						margin-left: 30rpx;
-						padding: 10rpx 32rpx;
-						border-radius: 28rpx;
-						font-size: 26rpx;
-						z-index: 2;
-					}
-				}
-
-			}
-
-			.modelNum-box {
-				padding: 30rpx 30rpx;
-				border-bottom: 1rpx solid #EDEDED;
-				width: 690rpx;
-
-				.modelNumName-box {
-					display: flex;
-					flex-wrap: wrap;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 30rpx;
-					margin-left: -30rpx;
-
-					.modelNumName-on {
-						background-color: #FFE4D0;
-						color: #C5AA7B;
-						margin-left: 30rpx;
-						padding: 10rpx 32rpx;
-						border-radius: 28rpx;
-						border: 1rpx solid #C5AA7B;
-						font-size: 26rpx;
-						text-align: center;
-					}
-
-					.modelNumName {
-						background-color: #F5F5F5;
-						margin-left: 30rpx;
-						padding: 10rpx 32rpx;
-						border-radius: 28rpx;
-						font-size: 26rpx;
-					}
-				}
-			}
-
-			.goodsNum-box {
-				padding: 30rpx 30rpx;
-				width: 690rpx;
-				padding-bottom: 140rpx;
-
-				.goodsNumber {
-					text-align: center;
-					border: 1rpx solid #999999;
-					padding: 3rpx 20rpx;
-				}
-
-				.subtract {
-					border: 1rpx solid #999999;
-					padding: 3rpx 20rpx;
-					margin-right: -1rpx;
-				}
-
-				.add {
-					border: 1rpx solid #999999;
-					padding: 3rpx 20rpx;
-					margin-left: -1rpx;
-				}
-			}
-
-			.goosDetailbut-box {
-				.joinShopCartBut {
-					width: 343rpx;
-					height: 80rpx;
-					background-color: #FFC300;
-					color: #FFFEFE;
-					font-size: 28rpx;
-					line-height: 80rpx;
-					text-align: center;
-					margin-left: 30rpx;
-				}
-
-				.buyNowBut {
-					width: 343rpx;
-					height: 80rpx;
-					border-radius: 0 40rpx 40rpx 0;
-					background-color: #FF6F00;
-					color: #FFFEFE;
-					font-size: 28rpx;
-					line-height: 80rpx;
-					text-align: center;
-				}
-			}
-		}
-	}
+page {
+  // background: #f7f7f7;
+}
+
+.content {
+  padding: 0 0 110rpx;
+  overflow: hidden;
+
+  .goosDetailshow-box {
+    .detailImg-box {
+      margin-top: 30upx;
+      margin-left: 30upx;
+      border-radius: 10upx;
+      border-bottom: 1upx solid #EDEDED;
+      padding-bottom: 20upx;
+      width: 690upx;
+
+      .detailImg {
+        width: 180upx;
+        height: 180upx;
+      }
+    }
+
+    .color-box {
+      padding: 30upx 30upx;
+      border-bottom: 1upx solid #EDEDED;
+      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;
+        }
+      }
+    }
+
+    .goodsNum-box {
+      padding: 30upx 30upx;
+      width: 690upx;
+      padding-bottom: 140upx;
+
+      .goodsNum {
+        height: 50upx;
+
+        text {
+          display: inline-block;
+          width: 50upx;
+          height: 50upx;
+          border: 1upx solid #999999;
+          text-align: center;
+          // line-height: 50upx;
+        }
+
+        .subtract {
+          border-right: 0upx;
+        }
+
+        .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;
+      margin-bottom: 48rpx;
+
+      button {
+        width: 342rpx;
+        height: 100rpx;
+        line-height: 100rpx;
+        font-size: 28rpx;
+        border: 1px solid;
+        border-radius: 0;
+      }
+
+      .submitBtn {
+        color: #FFEBC4;
+        background: #333333;
+      }
+
+
+    }
+  }
+
+  .Put-box1 {
+    .btn {
+      text-align: center;
+      margin-top: 40rpx;
+      border: 1px solid #333333;
+      height: 80upx;
+      line-height: 80upx;
+      width: 240upx;
+      color: #333333;
+    }
+
+    .submit {
+      background-color: #333333;
+      color: #FFEBC4;
+    }
+  }
+
+  .cart-bg {
+    width: 100%;
+    height: 180rpx;
+
+    .cart-num-box {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+
+      image {
+        width: 286rpx;
+        height: 72rpx;
+      }
+
+      .btn-box {
+        font-size: 30rpx;
+        color: #333333;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: inline-block;
+      }
+    }
+
+    .num-box {
+      padding: 30rpx 0 30rpx 30rpx;
+      box-sizing: border-box;
+      font-size: 30rpx;
+      color: #C5CACF;
+    }
+  }
+
+  .cart-list-box {
+    box-sizing: border-box;
+
+    .item {
+      background: #fff;
+      border-radius: 10rpx;
+      margin-bottom: 20rpx;
+
+      .shop-box {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        border-bottom: 1px solid #eee;
+        border-top: 1px solid #eee;
+        position: relative;
+        .cart-select-img {
+          width: 40rpx;
+          height: 40rpx;
+          margin: 30rpx;
+          box-sizing: border-box;
+        }
+
+        .shop-name-box {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+          .shop-img {
+            width: 36rpx;
+            height: 36rpx;
+            margin-right: 10rpx;
+          }
+
+          .shop-name {
+            font-size: 30rpx;
+            color: #333;
+            font-weight: bold;
+            display: inline-block;
+            margin-left: 10rpx;
+          }
+
+          .arrow-right-img {
+            width: 30rpx;
+            height: 30rpx;
+            box-sizing: border-box;
+            margin-left: 30rpx;
+            position: absolute;
+            right: 30rpx;
+          }
+        }
+      }
+      .rulesBox {
+        height: 86rpx;
+        background: #F9F6F1;
+        padding: 0 20rpx;
+        image {
+          width: 126rpx;
+          height: 46rpx;
+        }
+      }
+      .product-list-box {
+        .pro-item {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+          .cart-select-img {
+            width: 40rpx;
+            height: 40rpx;
+            margin: 30rpx;
+            box-sizing: border-box;
+          }
+
+          .pro-r {
+            flex: 1;
+            border-bottom: 1px solid #eee;
+            display: flex;
+            flex-direction: row;
+            padding: 30rpx 30rpx 30rpx 0;
+            box-sizing: border-box;
+            overflow: hidden;
+
+            .pro-img {
+              width: 180rpx;
+              height: 180rpx;
+              border-radius: 10rpx;
+              margin-right: 30rpx;
+            }
+
+            .pro-r-r {
+              flex: 1;
+              font-size: 26rpx;
+              color: #333;
+              overflow: hidden;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
+
+              .pro-name {
+                height: 66rpx;
+                line-height: 33rpx;
+                display: -webkit-box;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                word-break: break-all;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+              }
+
+              .sku-box {
+                width: auto;
+                display: inline;
+                height: 40rpx;
+                border-radius: 4rpx;
+                padding: 0 0 0 10rpx;
+                box-sizing: border-box;
+                font-size: 24rpx;
+                color: #999;
+
+                text {
+                  border: 2rpx solid #E4E5E6;
+                  padding: 2rpx 10rpx;
+                }
+              }
+
+              .pro-price-num-box {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-between;
+
+                .pro-price-box {
+                  font-size: 36rpx;
+                  color: #333333;
+                  font-weight: 400;
+
+                  .fuhao {
+                    font-size: 24rpx;
+                  }
+                }
+
+                .pro-num-box {
+                  width: 140rpx;
+                  height: 40rpx;
+                  border: 1px solid #ddd;
+                  border-radius: 4rpx;
+                  display: flex;
+                  flex-direction: row;
+                  justify-content: space-between;
+
+                  .num-btn {
+                    font-size: 34rpx;
+                    color: #999999;
+                    display: inline-block;
+                    width: 40rpx;
+                    text-align: center;
+                    line-height: 32rpx;
+                    height: 40rpx;
+                  }
+
+                  .num-btn.r {
+                    border-right: 1px solid #ddd;
+                  }
+
+                  .num-btn.l {
+                    border-left: 1px solid #ddd;
+                  }
+
+                  .num {
+                    font-size: 26rpx;
+                    color: #333;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .pro-item:last-of-type .pro-r {
+          border-bottom: none;
+        }
+      }
+    }
+  }
+
+  .emptyCart-box {
+    margin-top: 70rpx;
+
+    .emptyCart-img {
+      width: 216rpx;
+      height: 156rpx;
+    }
+
+    .goToShopping {
+      width: 282rpx;
+      height: 84rpx;
+      line-height: 84rpx;
+      text-align: center;
+      background: #333333;
+      margin-top: 40rpx;
+      color: #FFEBC4;
+      font-size: 28rpx;
+    }
+  }
+
+  .cart-bottom-box-h5 {
+    position: fixed;
+    bottom: 100rpx;
+    width: 100%;
+  }
+
+  .cart-bottom-box-app {
+    position: fixed;
+    bottom: 0rpx;
+    width: 100%;
+  }
+
+  .cart-bottom {
+    height: 120rpx;
+    background: #fff;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    border-top: 1rpx solid #eee;
+  }
+
+  .left {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 28rpx;
+    color: #666;
+
+    .cart-select-img {
+      width: 40rpx;
+      height: 40rpx;
+      margin: 30rpx;
+      box-sizing: border-box;
+    }
+  }
+
+  .right {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    box-sizing: border-box;
+
+    .price-box {
+      font-size: 30rpx;
+      color: #333;
+
+      .price {
+        font-size: 40rpx;
+        color: #C83732;
+        font-weight: bold;
+      }
+    }
+
+    .btn-confirm {
+      width: 232rpx;
+      height: 120rpx;
+      background: #333333;
+      margin-left: 18rpx;
+      text-align: center;
+      line-height: 120rpx;
+      font-size: 28rpx;
+      color: #FFEBC4;
+    }
+
+    .btn-delete {
+      width: 232rpx;
+      height: 120rpx;
+      line-height: 120rpx;
+      text-align: center;
+      font-size: 28rpx;
+      color: #FFFFFF;
+      background: #C83732;
+    }
+  }
+
+  .goosDetailshow-box {
+    .detailImg-box {
+      margin-top: 30rpx;
+      margin-left: 30rpx;
+      border-radius: 10rpx;
+      border-bottom: 1rpx solid #EDEDED;
+      padding-bottom: 20rpx;
+      width: 690rpx;
+
+      .detailImg {
+        width: 180rpx;
+        height: 180rpx;
+      }
+    }
+
+    .color-box {
+      padding: 30rpx 30rpx;
+      border-bottom: 1rpx solid #EDEDED;
+      width: 690rpx;
+      .skuStyle{
+        padding: 20rpx 0;
+      }
+
+      .skuStyle:nth-child(2) {
+        border-top: 1px solid #F3F4F5;
+      }
+
+      .colorName-box {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 30rpx;
+        margin-left: -30rpx;
+
+        .colorName-on {
+          background-color: #FFE5D0;
+          color: #C5AA7B;
+          margin-left: 30rpx;
+          padding: 10rpx 32rpx;
+          border-radius: 28rpx;
+          border: 1rpx solid #C5AA7B;
+          font-size: 26rpx;
+          text-align: center;
+          z-index: 1;
+        }
+
+        .colorName {
+          background-color: #F5F5F5;
+          margin-left: 30rpx;
+          padding: 10rpx 32rpx;
+          border-radius: 28rpx;
+          font-size: 26rpx;
+          z-index: 2;
+        }
+      }
+
+    }
+
+    .modelNum-box {
+      padding: 30rpx 30rpx;
+      border-bottom: 1rpx solid #EDEDED;
+      width: 690rpx;
+
+      .modelNumName-box {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 30rpx;
+        margin-left: -30rpx;
+
+        .modelNumName-on {
+          background-color: #FFE4D0;
+          color: #C5AA7B;
+          margin-left: 30rpx;
+          padding: 10rpx 32rpx;
+          border-radius: 28rpx;
+          border: 1rpx solid #C5AA7B;
+          font-size: 26rpx;
+          text-align: center;
+        }
+
+        .modelNumName {
+          background-color: #F5F5F5;
+          margin-left: 30rpx;
+          padding: 10rpx 32rpx;
+          border-radius: 28rpx;
+          font-size: 26rpx;
+        }
+      }
+    }
+
+    .goodsNum-box {
+      padding: 30rpx 30rpx;
+      width: 690rpx;
+      padding-bottom: 140rpx;
+
+      .goodsNumber {
+        text-align: center;
+        border: 1rpx solid #999999;
+        padding: 3rpx 20rpx;
+      }
+
+      .subtract {
+        border: 1rpx solid #999999;
+        padding: 3rpx 20rpx;
+        margin-right: -1rpx;
+      }
+
+      .add {
+        border: 1rpx solid #999999;
+        padding: 3rpx 20rpx;
+        margin-left: -1rpx;
+      }
+    }
+
+    .goosDetailbut-box {
+      .joinShopCartBut {
+        width: 343rpx;
+        height: 80rpx;
+        background-color: #FFC300;
+        color: #FFFEFE;
+        font-size: 28rpx;
+        line-height: 80rpx;
+        text-align: center;
+        margin-left: 30rpx;
+      }
+
+      .buyNowBut {
+        width: 343rpx;
+        height: 80rpx;
+        border-radius: 0 40rpx 40rpx 0;
+        background-color: #FF6F00;
+        color: #FFFEFE;
+        font-size: 28rpx;
+        line-height: 80rpx;
+        text-align: center;
+      }
+    }
+  }
+}
 </style>

pages_category_page1/distributionModule/recruit.vue

@@ -139,7 +139,7 @@
 			},
 			//申请为分销员
 			applyForRecruit(){
-				var regphone = /^((1[3,5,8,7,6,9][0-9])|(14[5,7])|(17[0-9])|(19[7]))\d{8}$/;
+				var regphone = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
 				if(this.userName == ''){
 					uni.showToast({
 						title:'真实姓名不能为空',

pages_category_page1/distributionModule/shareProduct.vue

@@ -5,7 +5,12 @@
 				<view class="rect" @tap.stop>
 					<!-- 关闭按钮 -->
 					<view class="guanbiView">
-						<img @click="showcos" src="@../../static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></img>
+            <!-- #ifdef MP-WEIXIN -->
+            <img @click="showcos" src="@../../static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></img>
+            <!-- #endif -->
+            <!-- #ifdef H5 || APP-PLUS -->
+            <image @click="showcos" src="@../../static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></image>
+            <!-- #endif -->
 					</view>
 					<!-- 内容 -->
 					<view class="imgBox">

pages_category_page1/goodsModule/canvasGoods.vue

@@ -70,7 +70,7 @@
 				      <p>{{item.productName}}</p>
 				      <view class="number" v-if="item.users != null">
                 <view class="numText">{{item.users}}人付款</view>
-                <view class="numText" v-if="item.total !=0">限量{{item.total}}件</view>
+<!--                <view class="numText" v-if="item.total !=0">限量{{item.total}}件</view>-->
               </view>
 					  <view class="flex-row-plus flex-item mar-top-30">
               <image class="iconImg" v-if="item.activityType == 1" src="../../static/images/groupBuyIcon.png"></image>
@@ -146,22 +146,22 @@
 			}
 		},
 		methods: {
-      // sortTap(index){
-      //   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
-      //   }
-      //   this.searchList()
-      // },
+      sortTap(index){
+        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
+        }
+        this.searchList()
+      },
 			// searchTextDel(){
 			// 	this.keyWord = ''
 			// },

pages_category_page1/goodsModule/evaluateList.vue

@@ -25,7 +25,7 @@
 						<image @click="previewImg(index,cindex)" class="img-item" :src="commentItemImg"></image>
 					</view>
 				</view>
-        <view class="addEvaluate">
+        <view class="addEvaluate" v-if="item.addComment !== ''">
           <view class="fs26 font-color-C5AA7B">用户追加评价</view>
           <view class="addEvaluateText">{{item.addComment}}</view>
           <view class="item-image-box" v-if="item.addImages">
@@ -61,6 +61,7 @@
 		},
 		onLoad(list) {
 			this.commentList = JSON.parse(list.commentList)
+      console.log(this.commentList, '1111')
 			this.commentListLength = this.commentList.length
 		},
 		methods: {

pages_category_page1/goodsModule/goodsDetails.vue

@@ -2040,7 +2040,14 @@
 						background: #C5AA7B;
 						border-radius: 50%;
 						opacity: 1;
+            z-index: 999;
 					}
+          // #ifdef APP-PLUS
+          .cartAllNum{
+            right: -6rpx;
+            top: -6rpx;
+          }
+          // #endif
 					/* #ifdef H5 */
 					.cartAllNum{
 						right: -10rpx;

pages_category_page1/goodsModule/goodsList.vue

@@ -78,7 +78,7 @@
               <image class="iconImg" v-if="item.activityType == 4" src="../../static/images/spikeIcon.png"></image>
               <image class="iconImg" v-if="item.activityType == 3" src="../../static/images/discountListIcon.png"></image>
               <image class="iconImg" v-if="item.activityType == 5" src="../../static/images/discountListIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 8" src="../../static/images/memberCenterIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 9" src="../../static/images/memberCenterIcon.png"></image>
 							<view class="font-color-C83732 flex-row-plus">
 								<b>￥</b>
 								<label class="fs28">{{item.price}}</label>

pages_category_page1/orderModule/orderConfirm.vue

@@ -88,7 +88,10 @@
       <view class="discount-item" @click="showDiscount">
         <view class="discount-label">平台优惠</view>
         <view class="discount-info-box flex-items">
-          <view class="discount-info2" v-if="promotionInfoDTO.couponId">-￥{{reduceMoney}}</view>
+          <view class="discount-info2" v-if="promotionInfoDTO.couponId">
+            <text v-if="promotionInfoDTO.couponType === 2">{{ reduceMoney }}折</text>
+            <text v-else> -￥{{reduceMoney}}</text>
+          </view>
           <view class="discount-info1" v-else-if="couponsList.length<1">无</view>
           <view class="discount-info1" v-else>不使用</view>
           <image class="discount-img" src="../../static/images/arrowRight.png"></image>
@@ -142,7 +145,7 @@
       <view class="flex-items flex-sp-between">
         <text class="num-box">共{{totalCount}}件</text>
         <view>
-          <text class="total">合计：</text><text v-if="(totalprice - reduceMoney)>0" class="price">¥{{ (totalprice - reduceMoney).toFixed(2) }}</text><text v-else class="price">¥0.00</text>
+          <text class="total">合计：</text><text v-if="totalprice>0" class="price">¥{{ totalprice.toFixed(2) }}</text><text v-else class="price">¥0.00</text>
         </view>
       </view>
       <!-- active 当有地址时按钮加上active选中的样式-->
@@ -163,7 +166,8 @@
               <view v-if="usableListLength">
                 <view class="label-lingqu">可用优惠券列表</view>
                 <view class="coupon-item" v-for="(usableItem, index) in settlement.coupons" :key="index" @click="couponItemTap(index,usableItem)">
-                  <view class="money-box">￥{{usableItem.reduceMoney}}</view>
+                  <view class="money-box" v-if="usableItem.couponType == 1">￥{{usableItem.reduceMoney}}</view>
+                  <view class="money-box" v-else>{{usableItem.reduceMoney}}折券</view>
                   <view class="info-box">
                     <view class="info">满{{usableItem.fullMoney}}元可用</view>
                     <view class="date" style="font-size:22upx;  margin-top: 20upx;">{{getDate(usableItem.startTime)}}至{{getDate(usableItem.endTime)}}</view>
@@ -305,7 +309,8 @@ export default {
       showWechatPayType: false,
       showAlipayPayType: false,
       showHuabeiPayType: false,
-      orderId: null
+      orderId: null,
+      couponType: 0
     }
   },
   onLoad(options) {
@@ -424,11 +429,12 @@ export default {
                   if (this.settlement.shops[s].skus[k].productId == this.settlement.shops[s].shopCoupons[0].ids[i]) {
                     skustotal = this.settlement.shops[s].skus[k].total * (this.settlement.shops[s].shopCoupons[0].reduceMoney /
                         10)
+                    console.log(skustotal, 'skustotal')
                     this.settlement.shops[s].skus[k].skuTotalNum = skustotal
                   }
                 }
                 shoptotal += this.settlement.shops[s].skus[k].skuTotalNum
-                this.settlement.shops[s].totalNum = this.settlement.shops[s].total - shoptotal.toFixed(2)
+                this.settlement.shops[s].totalNum = shoptotal.toFixed(2)
               }
               // this.settlement.shops[s].total = shoptotal.toFixed(2)
               this.selectShopCoupon.push(this.settlement.shops[s].shopCoupons[0])
@@ -469,6 +475,16 @@ export default {
     },
     // 平台优惠券选择
     couponItemTap(index, usableItem) {
+      console.log(this.selectShopCoupon[0], 'testpintai')
+      if (this.selectShopCoupon.length) {
+        if (this.selectShopCoupon[0].ifAdd === 0) {
+          uni.showToast({
+            title: '不可与商家券券叠加使用！',
+            icon: 'none'
+          })
+          return false
+        }
+      }
       if (this.couponCheckedindex === index) {
         let promotionInfoDTO = {}
         if (usableItem.couponId) {
@@ -480,7 +496,7 @@ export default {
         this.couponCheckedindex = null
         this.couponCheckedType = false
         this.isShowDiscount = false
-        this.getTotal()
+        this.getTotal(usableItem)
       } else {
         //console.log(usableItem.reduceMoney, 'item')
         let moneySum = 0
@@ -488,7 +504,7 @@ export default {
         for (let i = 0; i < shopslen; i++) {
           moneySum += this.settlement.shops[i].total
         }
-        if (usableItem.reduceMoney >= moneySum) {
+        if (usableItem.reduceMoney >= moneySum && usableItem.couponType !== 2) {
           uni.showToast({
             title: '不可使用大于等于合计金额的优惠劵！',
             icon: 'none'
@@ -499,13 +515,15 @@ export default {
         if (usableItem.couponId) {
           promotionInfoDTO['couponId'] = usableItem.couponId
           promotionInfoDTO['ifAdd'] = usableItem.ifAdd
+          promotionInfoDTO['couponType'] = usableItem.couponType
         }
         this.promotionInfoDTO = promotionInfoDTO
         this.reduceMoney = usableItem.reduceMoney
+        // this.couponType = usableItem.couponType
         this.couponCheckedindex = index
         this.couponCheckedType = true
         this.isShowDiscount = false
-        this.getTotal()
+        this.getTotal(usableItem)
       }
     },
     // 店铺优惠券选择
@@ -528,7 +546,7 @@ export default {
         this.shopCouponCheckedType = false
         this.isShopCoupons = false
         this.settlement.shops[this.shopIndex].currentCoupon.shopCouponId = 0
-        this.getTotal()
+        this.getTotal(sItem)
         if (this.selectShopCoupon[i].id === sItem.id) {
           //console.log(666)
           this.selectCouponIdList.splice(i, 1)
@@ -614,11 +632,11 @@ export default {
               console.log(this.settlement.shops[this.shopIndex].skuTotalNum, 'shoptotal22')
             }
           }
-          this.getTotal()
+          this.getTotal(sItem)
         }
       }
     },
-    getTotal() {
+    getTotal(item) {
       this.totalprice = 0
       this.totalCount = 0
       let allNum = 0
@@ -628,13 +646,15 @@ export default {
         allNum += this.settlement.shops[i].totalNum
         this.totalCount += this.settlement.shops[i].number
       }
-      if (this.totalprice - this.reduceMoney > 0) {
+      if (item.couponType === 1 && this.totalprice - this.reduceMoney > 0) {
         this.discountPrice = allNum - this.totalprice + this.reduceMoney
+      } else if (item.couponType === 2 && this.reduceMoney > 0) {
+        this.discountPrice = allNum - this.totalprice * (this.reduceMoney / 10)
+        console.log(this.discountPrice, allNum, this.totalprice, this.reduceMoney)
+        this.totalprice = allNum - this.discountPrice
       } else {
         this.discountPrice = allNum
       }
-      this.discountPrice = this.discountPrice.toFixed(2)
-      this.discountPrice = parseFloat(this.discountPrice)
       this.recalcHuabei()
       // console.log(this.totalprice - this.reduceMoney, 'dis')
     },
@@ -1100,7 +1120,7 @@ export default {
       // #ifdef MP-ALIPAY
       this.showAlipayPayType = true
       this.showHuabeiPayType = true
-	  this.paymentMode = 2
+	    this.paymentMode = 2
       // #endif
     }
   },

pages_category_page1/store/index.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<!-- 店铺首页 -->
 		<view class="content" v-if="id !== ''">
-			<view class="shop-top" :style="{'margin-top':(isIphone==true? 100:0)+'rpx'}">
+			<view class="shop-top">
 				<image src="../../static/images/back_img04.png" class="back" @click="back"></image>
         <view class="search-btn" @click="searchPro">
           <image class="search-icon" src="@/static/images/searchImg1.png" mode="widthFix"></image>
@@ -477,6 +477,11 @@ page {
     width: 100%;
     padding-top: 20rpx;
 	}
+  // #ifdef APP-PLUS
+  .shop-top {
+    padding-top: 80rpx;
+  }
+  // #endif
 .stopInfo {
   padding: 20rpx;
   background: #F8F8F8;

pages_category_page2/userModule/accountLogin.vue

@@ -115,20 +115,22 @@
 								uni.removeStorageSync('inviteSpell');
 							}, 2000)
 						} else {
-							if (that.beforePage && that.beforePage.route !==
-								'pages_category_page2/userModule/accountLogin' &&
-								that.beforePage.route !== 'pages_category_page2/userModule/login') {
-							  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') {
-								uni.navigateBack({
-									delta: 2
-								})
-							} 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'

pages_category_page2/userModule/register.vue

@@ -68,7 +68,7 @@
 		methods: {
 			// 注册账号
 			getRegister() {
-				let phoneCodeVerification = /^[1][3,4,5,7,8][0-9]{9}$/;
+				let phoneCodeVerification = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
 				if (this.phone == '') {
 					uni.showToast({
 						title: '请输入手机号！',
@@ -117,7 +117,7 @@
 			},
 			// 获取验证码
 			getVerify() {
-				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+				let phoneCodeVerification = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
 				if (this.phone == '') {
 					uni.showToast({
 						title: '请输入手机号！',
@@ -166,7 +166,7 @@
 						icon: 'none'
 					})
 					return false;
-				} else if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phone))) {
+				} else if (!(/^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(this.phone))) {
 					uni.showToast({
 						title: '输入的手机号错误',
 						icon: 'none'