From 9b658bd2946b643076aa79d1cb4e4abb3487dc3f Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 09:03:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/index.vue   |  4 ++--
 pages/goods/detail.vue | 14 +++++++-------
 pages/goods/list.vue   |  4 ++--
 pages/index/index.vue  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 56dd0d4..587290b 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -90,7 +90,7 @@
 								<text v-if="item.line_price_min > 0"
 									class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 							</view>
-							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
+							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
 						</view>
 						<view class="goodsInfo1">
 							<view class="oneTip">
@@ -139,7 +139,7 @@
 								<text v-if="item.line_price_min > 0"
 									class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 							</view>
-							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
+							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
 						</view>
 						<view class="goodsInfo1">
 							<view class="oneTip">
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index c235197..5713b39 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -46,7 +46,7 @@
 						<text class="span"
 							v-if="userInfo.user_type==40">￥{{goods.cost_price_min?Number(goods.cost_price_min):0}}</text>
 						<text class="span"
-							v-else>￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?(Number(goods.line_price_min)-Number(goods.goods_price_min)):0}}</text>
+							v-else>￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}}</text>
 					</view>
 				</view>
 			</view>
@@ -76,7 +76,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="goodsOpera">
+				<!-- <view class="goodsOpera">
 					<view v-if="goods.goods_no" class="goodsNum" @click="copyNum(goods.goods_no)">
 						<text>{{goods.goods_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"></image>
@@ -87,7 +87,7 @@
 							class="tips">
 						</image>
 					</view>
-				</view>
+				</view> -->
 				<view class="rank" @click="goRanking()" v-if="goods && goods.category">
 					<text><text style="font-size: 32rpx;font-weight: bold;">排行榜</text>
 						{{goods.category.name}}热搜榜第{{goods.paihang}}名</text>
@@ -105,11 +105,11 @@
 							<u-icon name="arrow-right" color="#B7B7B7" size="22"></u-icon>
 						</picker>
 					</view>
-					<view v-if="goods.unicode" class="operaImg" @click="copyNum(goods.unicode)">
+					<view v-if="goods.goods_no" class="operaImg" @click="copyNum(goods.goods_no)">
 						<view class="left_1">
 							{{goods.goods_source}}
 						</view>
-						<text>{{goods.unicode}}</text>
+						<text>{{goods.goods_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"
 							style="width: 27rpx;height: 27rpx;margin-left: 8rpx;"></image>
 					</view>
@@ -499,7 +499,7 @@
 		onLoad(options) {
 			const that = this;
 			let result = uni.getStorageSync("addressResult")
-			this.addressResult = result.address_component || ''
+			this.addressResult = result?result.address_component:this.addressResult
 			this.isPre = options.isPre ? options.isPre : null
 			// 记录query参数
 			// this.onRecordQuery(options)
@@ -1297,7 +1297,7 @@
 				}
 
 				.rightBox {
-					width: 195rpx;
+					min-width: 195rpx;
 					height: 64rpx;
 					background: #FFFFFF;
 					border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index fb32e83..a23084b 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -127,7 +127,7 @@
 												<text v-if="item.line_price_min > 0"
 													class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 											</view>
-											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode="">
+											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
 											</image>
 										</view>
 										<view class="goodsInfo">
@@ -181,7 +181,7 @@
 												<text v-if="item.line_price_min > 0"
 													class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):''  }}</text>
 											</view>
-											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode="">
+											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
 											</image>
 										</view>
 										<view class="goodsInfo">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d60e86e..476f152 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -259,7 +259,7 @@
 										<text v-if="item.line_price_min > 0"
 											class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 									</view>
-									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
+									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
 								</view>
 								<view class="goodsInfo1">
 									<view class="oneTip">
@@ -308,7 +308,7 @@
 										<text v-if="item.line_price_min > 0"
 											class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 									</view>
-									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="is_check==1" mode=""></image>
+									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
 								</view>
 								<view class="goodsInfo1">
 									<view class="oneTip">

From 6d90d8e1bc0ceb99fdb16e07d7fd9020920e5f2d Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 10:36:35 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/goods/index.js                   |    2 +-
 components/goods-sku-popup/index.vue | 2836 +++++++++++++-------------
 pages/goods/components/SkuPopup.vue  |   12 +-
 pages/goods/detail.vue               |   31 +-
 pages/sureOrder/index.vue            | 2379 +++++++++++----------
 5 files changed, 2738 insertions(+), 2522 deletions(-)

diff --git a/api/goods/index.js b/api/goods/index.js
index ffe6ee8..904f6a0 100644
--- a/api/goods/index.js
+++ b/api/goods/index.js
@@ -92,5 +92,5 @@ export const editGoodsSeckillPrice = param => {
 }
 // 是否有货
 export const getGoodsStock = param => {
-  return request.get('goods/getGoodsStock', param)
+  return request.post('goods/getGoodsStock', param)
 }
\ No newline at end of file
diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue
index 9c28eb4..bd422d6 100644
--- a/components/goods-sku-popup/index.vue
+++ b/components/goods-sku-popup/index.vue
@@ -1,1381 +1,1455 @@
-<template>
-  <view class="goods-sku-popup" catchtouchmove="true" :class="valueCom && complete ? 'show' : 'none'" @touchmove.stop.prevent="moveHandle"
-    @click.stop="stop">
-    <!-- 页面内容开始 -->
-    <view class="mask" @click="close('mask')"></view>
-    <view class="layer attr-content" :class="{'safe-area-inset-bottom':safeAreaInsetBottom }"
-      :style="{ borderRadius: borderRadius + 'rpx ' + borderRadius + 'rpx 0 0' }">
-      <view class="specification-wrapper">
-        <scroll-view class="specification-wrapper-content" scroll-y="true">
-          <view class="specification-header">
-            <view class="specification-left">
-              <image class="product-img" :src="selectShop.image ? selectShop.image : goodsInfo[goodsThumbName]"
-                :style="{ backgroundColor: goodsThumbBackgroundColor }" mode="aspectFill" @click="previewImage"></image>
-            </view>
-            <view class="specification-right">
-              <view class="price-content" :style="{ color: themeColorFn('priceColor') }">
-                <text class="sign">¥</text>
-                <text class="price" :class="priceCom.length > 16 ? 'price2' : ''">{{ priceCom }}</text>
-              </view>
-              <view class="inventory" v-if="!hideStock">{{ stockText }}：{{ stockCom }}</view>
-              <view class="inventory" v-else></view>
-              <view class="choose" v-show="isManyCom">
-                <text v-if="!selectArr.every(val => val == '')">已选：{{ selectArr.join(' ') }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="specification-content">
-            <view v-show="isManyCom" class="specification-item" v-for="(item, index1) in goodsInfo[specListName]" :key="index1">
-              <view class="item-title">{{ item.name }}</view>
-              <view class="item-wrapper">
-                <view class="item-content" v-for="(item_value, index2) in item.list" :key="index2"
-                  :class="[item_value.ishow ? '' : 'noactived', subIndex[index1] == index2 ? 'actived' : '']" :style="[
-										item_value.ishow ? '' : themeColorFn('disableStyle'),
-										item_value.ishow ? themeColorFn('btnStyle') : '',
-										subIndex[index1] == index2 ? themeColorFn('activedStyle') : ''
-									]" @click="skuClick(item_value, index1, index2,item)">
-                  {{ item_value.name }}
-                </view>
-              </view>
-            </view>
-            <view class="number-box-view" v-if="!userInfo.user_type || userInfo.user_type != 40">
-              <view style="flex: 1;">数量</view>
-              <view style="flex: 4;text-align: right;">
-                <number-box v-model="selectNum" :min="minBuyNum || 1" :max="maxBuyNumCom" :step="stepBuyNum || 1"
-                  :step-strictly="stepStrictly" :positive-integer="true" @change="numChange" />
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-        <view class="close" @click="close('close')" v-if="showClose != false">
-          <image class="close-item" :src="closeImage"></image>
-        </view>
-      </view>
-
-      <view class="btn-wrapper" v-if="outFoStock || mode == 4">
-        <view class="sure" style="color:#ffffff;background-color:#cccccc">{{ noStockText }}</view>
-      </view>
-      <view class="btn-wrapper" v-else-if="mode == 1">
-        <view class="sure add-cart" style="border-radius:38rpx 0rpx 0rpx 38rpx;" :style="{
-						color: themeColorFn('addCartColor'),
-						backgroundColor: themeColorFn('addCartBackgroundColor')
-					}" @click="addCart">
-          {{ addCartText }}
-        </view>
-
-        <view class="sure" style="border-radius:0rpx 38rpx 38rpx 0rpx;" :style="{
-						color: themeColorFn('buyNowColor'),
-						backgroundColor: themeColorFn('buyNowBackgroundColor')
-					}" @click="buyNow">
-          {{ userInfo.user_type == 40?'修改价格':buyNowText }}
-        </view>
-      </view>
-      <view class="btn-wrapper" v-else-if="mode == 2">
-        <view class="sure add-cart" :style="{
-						color: themeColorFn('addCartColor'),
-						backgroundColor: themeColorFn('addCartBackgroundColor')
-					}" @click="addCart">
-          {{ addCartText }}
-        </view>
-      </view>
-      <view class="btn-wrapper" v-else-if="mode == 3">
-        <view class="sure" :style="{
-						color: themeColorFn('buyNowColor'),
-						backgroundColor: themeColorFn('buyNowBackgroundColor')
-					}" @click="buyNow">
-          {{ userInfo.user_type == 40?'修改价格':buyNowText }}
-        </view>
-      </view>
-    </view>
-    <!-- 页面内容结束 -->
-  </view>
-</template>
-
-<script>
-  import NumberBox from './number-box'
-  var vk; // vk依赖
-  var goodsCache = {}; // 本地商品缓存
-  export default {
-    name: 'GoodsSkuPopup',
-    components: { NumberBox },
-    emits: ['update:modelValue', 'input', 'update-goods', 'open', 'close', 'add-cart', 'buy-now', 'cart', 'buy', 'num-change'],
-    props: {
-      // true 组件显示 false 组件隐藏
-      value: {
-        Type: Boolean,
-        default: false
-      },
-      modelValue: {
-        Type: Boolean,
-        default: false
-      },
-      // vk云函数路由模式参数开始-----------------------------------------------------------
-      // 商品id
-      goodsId: {
-        Type: String,
-        default: ''
-      },
-      // vk路由模式框架下的云函数地址
-      action: {
-        Type: String,
-        default: ''
-      },
-      // vk云函数路由模式参数结束-----------------------------------------------------------
-      // 该商品已抢完时的按钮文字
-      noStockText: {
-        Type: String,
-        default: '该商品已抢完'
-      },
-      // 库存文字
-      stockText: {
-        Type: String,
-        default: '库存'
-      },
-      // 商品表id的字段名
-      goodsIdName: {
-        Type: String,
-        default: '_id'
-      },
-      // sku表id的字段名
-      skuIdName: {
-        Type: String,
-        default: '_id'
-      },
-      // sku_list的字段名
-      skuListName: {
-        Type: String,
-        default: 'sku_list'
-      },
-      // spec_list的字段名
-      specListName: {
-        Type: String,
-        default: 'spec_list'
-      },
-      // 库存的字段名 默认 stock
-      stockName: {
-        Type: String,
-        default: 'stock'
-      },
-      // sku组合路径的字段名
-      skuArrName: {
-        Type: String,
-        default: 'sku_name_arr'
-      },
-      // 默认单规格时的规格组名称
-      defaultSingleSkuName: {
-        Type: String,
-        default: '默认'
-      },
-      // 模式 1:都显示  2:只显示购物车 3:只显示立即购买 4:显示缺货按钮 默认 1
-      mode: {
-        Type: Number,
-        default: 1
-      },
-      // 点击遮罩是否关闭组件 true 关闭 false 不关闭 默认true
-      maskCloseAble: {
-        Type: Boolean,
-        default: true
-      },
-      // 顶部圆角值
-      borderRadius: {
-        Type: [String, Number],
-        default: 0
-      },
-      // 商品缩略图字段名(未选择sku时)
-      goodsThumbName: {
-        Type: [String],
-        default: 'goods_thumb'
-      },
-      // 商品缩略图背景颜色，如#999999
-      goodsThumbBackgroundColor: {
-        Type: String,
-        default: '#999999'
-      },
-      // 最小购买数量 默认 1
-      minBuyNum: {
-        Type: [Number, String],
-        default: 1
-      },
-      // 最大购买数量 默认 100000
-      maxBuyNum: {
-        Type: [Number, String],
-        default: 100000
-      },
-      // 步进器步长 默认 1
-      stepBuyNum: {
-        Type: [Number, String],
-        default: 1
-      },
-      // 是否只能输入 step 的倍数
-      stepStrictly: {
-        Type: Boolean,
-        default: false
-      },
-      // 自定义获取商品信息的函数,支付宝小程序不支持该属性,请使用localdata属性
-      customAction: {
-        Type: [Function],
-        default: null
-      },
-      // 本地数据源
-      localdata: {
-        type: Object
-      },
-      // 价格的字体颜色
-      priceColor: {
-        Type: String
-      },
-      // 立即购买按钮的文字
-      buyNowText: {
-        Type: String,
-        default: '立即购买'
-      },
-      // 立即购买按钮的字体颜色
-      buyNowColor: {
-        Type: String
-      },
-      // 立即购买按钮的背景颜色
-      buyNowBackgroundColor: {
-        Type: String
-      },
-      // 加入购物车按钮的文字
-      addCartText: {
-        Type: String,
-        default: '加入购物车'
-      },
-      // 加入购物车按钮的字体颜色
-      addCartColor: {
-        Type: String
-      },
-      // 加入购物车按钮的背景颜色
-      addCartBackgroundColor: {
-        Type: String
-      },
-      // 不可点击时,按钮的样式
-      disableStyle: {
-        Type: Object,
-        default: null
-      },
-      // 按钮点击时的样式
-      activedStyle: {
-        Type: Object,
-        default: null
-      },
-      // 按钮常态的样式
-      btnStyle: {
-        Type: Object,
-        default: null
-      },
-      // 是否显示右上角关闭按钮
-      showClose: {
-        Type: Boolean,
-        default: true
-      },
-      // 关闭按钮的图片地址 https://img.alicdn.com/imgextra/i1/121022687/O1CN01ImN0O11VigqwzpLiK_!!121022687.png
-      closeImage: {
-        Type: String,
-        default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAEyUlEQVR42sSZeWwNURTGp4OqtBo7sSXELragdkpQsRRJ1Zr4hyJiJ9YgxNIg1qANiT+E1i5IY0kVVWtQEbuEKLFGUSH27/ANN5PXmTvzupzkl/tm8t6b7517lnvvC0lKSjJ8WmnQAUSDFqABqALKgl8gD7wE90E2SAeXwFf1SxISErQeVtKHwCgwFsSDSIf3hYFKoCkYDBaDdyAViHdueHmoF6FtwDLQ23b/E7gM7oIcejIERIDaoBFoC8qA8mA8SQNz6W1XC9GY+nCQCCYAk/c+gF0gBZwH312+IxR0BCPBUIaH2A+wHsxHCHxx+gLT5QGN6a2JfG8uvVCDws9oiDQYlxkMGfHyQvARlADTwcXk5OT6foV2kS8ATXidymlcyen1a/Jjl9IJh3hPkjELYqO8Cu0KjjNZvtETw5jFBWXPmGSTGQKSeOn5iQ0kVLL0CINfPNcPbDMKyRCbGzEMBJ+ZD8cChYFdqGTqfsWT8otPGoVsEHsMwxDFs3shNsxJ6BrQ0Po8OGUUkVHsNCVml+cntB1jUWwn2GEUsTEMrASbDK+2CCQ0kYX6nfLLisMmKqUr0S60M+jG10vAm+JSCa8+x7CKlzHwaktV6DiObzUzPJIxFO1BQ12wGtTReO9GetVgY/kjNJzZbcWmTjHfxw51AsRqvL8eOAtmsJuFu3g1l+1ZLB5eDTVZ3K0P7tL0TkWOpSg61kVkBtuuNRthGs+wtJST5aQI7cEbkkRXNYVKgX6kIdYuUhYzMQwxN8tiExCLFqHNeSF9/aem0BzGp5PYQCJ7c/Gsk1RfuSD6U1dNpcDf9ZigTmKbMRZ9iVTsHscGJluW2FMf1SSQWGnBmaB6kCJVTVVNJZE++Cx9drEllS1KMCINpURFmEbBWA63Fz9s95cGIdJgp/zXmT4pZcOvSUzuZttTbblmnc3PIjjmidDXvKgdhMh0JdbzuCjWrbNOVovjS5P7bkPJ/mBESkz2BO0166ybNeJ431S2q+01NntuIq3E0amzjiZtk9tssWyTDzO4525bACK9NAUn68TtkNhpEXpOSagRml+S6iLSSeweHv242Qhl13rRyvoDvDlKyTQny/ZQJ+1iH7vVbEx7OR5UiKVIO7VicgvHCtwrudloMIV7/0uadVYW57O4Wvvi8v4pymlKkrpwvsDeLLZAY2pkwbAB3PSQfC+4cH7l4k1ZH8zkZRq8ecO+Z5rN40JJqnXFuGfaxPCTLjcn0OZOpnArXw8HY4paIbw5CcMgXq6HN2/mt6+XGLrN15tBryIUGavMpCTrfKcDCKkAceA9S8nhAOehhSUyhXpkBxxnP4YM1InugP7cBkjBPcqVUWFYCEROxXiQz5JlXV+IfKh7mpfJac+lZ6V87QXVClBkTc7YWsWTPSDyitfzUTlJlj8TbvE6jluDOdwZ+jX57GLO3ADeuyZrDYi86vV81FD2UVGsmT+5Zl0BnkhoseOEaogL46pqO4v/IqUEyalIR4h85BgjHv6+aUWRMbb7EstX6O0cpT1Gco0ry8fWygLDMjmDnQeBt3Qe7uVfkeugDwVLcsVzGsuwLXbV+I63XNAkG5r/hvgRqgqWs6pJPKrsbvz/Q6yyun0w/h6lP+BnzrCpfPMT2L8FGAA7k1GZ/vnaqAAAAABJRU5ErkJggg=='
-      },
-      // 是否隐藏库存显示
-      hideStock: {
-        Type: Boolean,
-        default: false
-      },
-      // 颜色主题
-      theme: {
-        Type: String,
-        default: 'default'
-      },
-      // 请求中的提示
-      actionTips: {
-        Type: String,
-        default: '请求中...'
-      },
-      // 默认选中的SKU
-      defaultSelect: {
-        Type: Object
-      },
-      // 是否使用缓存
-      useCache: {
-        Type: Boolean,
-        default: true
-      },
-      /**
-       * 默认商品,设置该值可快速展示商品
-       * 逻辑: 先展示 defaultGoods 信息,再取数据库,再更新页面(通常为更新库存)
-       */
-      defaultGoods: {
-        Type: Object
-      },
-      /**
-       * 金额是否需要除以100
-       * 1:金额会除以100
-       * 0:金额不会除以100
-       */
-      amountType: {
-        Type: Number,
-        default: 1
-      },
-      // 每次选择完SKU后，购买数量归1，如果有最小购买数量，则设置为最小购买数量
-      selectedInit: {
-        Type: Boolean,
-        default: false
-      },
-      // 是否开启底部安全区适配，默认true
-      safeAreaInsetBottom: {
-        Type: Boolean,
-        default: true
-      },
-    },
-    data() {
-      return {
-		userInfo: {},
-        complete: false, // 组件是否加载完成
-        goodsInfo: {}, // 商品信息
-        isShow: false, // true 显示 false 隐藏
-        initKey: true, // 是否需要初始化 true 是 false 否
-        // #ifndef MP-BAIDU
-        shopItemInfo: {}, // 存放要和选中的值进行匹配的数据（因百度小程序setData不支持中文字段，故不编译shopItemInfo变量）
-        // #endif
-        selectArr: [], // 存放被选中的值
-        subIndex: [], // 是否选中 因为不确定是多规格还是单规格，所以这里定义数组来判断
-        selectShop: {}, // 存放最后选中的商品
-        selectNum: this.minBuyNum || 1, // 选中数量
-        outFoStock: false, // 是否全部sku都缺货
-        openTime: 0,
-        themeColor: {
-          // 默认主题
-          default: {
-            priceColor: 'rgb(254, 86, 10)',
-            buyNowColor: '#ffffff',
-            buyNowBackgroundColor: 'rgb(254, 86, 10)',
-            addCartColor: '#ffffff',
-            addCartBackgroundColor: 'rgb(255, 148, 2)',
-            btnStyle: {
-              color: '#333333',
-              borderColor: '#f4f4f4',
-              backgroundColor: '#ffffff'
-            },
-            activedStyle: {
-              color: 'rgb(254, 86, 10)',
-              borderColor: 'rgb(254, 86, 10)',
-              backgroundColor: 'rgba(254,86,10,0.1)'
-            },
-            disableStyle: {
-              color: '#c3c3c3',
-              borderColor: '#f6f6f6',
-              backgroundColor: '#f6f6f6'
-            }
-          },
-          // 红黑主题
-          'red-black': {
-            priceColor: 'rgb(255, 68, 68)',
-            buyNowColor: '#ffffff',
-            buyNowBackgroundColor: 'rgb(255, 68, 68)',
-            addCartColor: '#ffffff',
-            addCartBackgroundColor: 'rgb(85, 85, 85)',
-            activedStyle: {
-              color: 'rgb(255, 68, 68)',
-              borderColor: 'rgb(255, 68, 68)',
-              backgroundColor: 'rgba(255,68,68,0.1)'
-            }
-          },
-          // 黑白主题
-          'black-white': {
-            priceColor: 'rgb(47, 47, 52)',
-            buyNowColor: '#ffffff',
-            buyNowBackgroundColor: 'rgb(47, 47, 52)',
-            addCartColor: 'rgb(47, 47, 52)',
-            addCartBackgroundColor: 'rgb(235, 236, 242)',
-            // btnStyle:{
-            // 	color:"rgb(47, 47, 52)",
-            // 	borderColor:"rgba(235,236,242,0.5)",
-            // 	backgroundColor:"rgba(235,236,242,0.5)",
-            // },
-            activedStyle: {
-              color: 'rgb(47, 47, 52)',
-              borderColor: 'rgba(47,47,52,0.12)',
-              backgroundColor: 'rgba(47,47,52,0.12)'
-            }
-          },
-          // 咖啡色主题
-          coffee: {
-            priceColor: 'rgb(195, 167, 105)',
-            buyNowColor: '#ffffff',
-            buyNowBackgroundColor: 'rgb(195, 167, 105)',
-            addCartColor: 'rgb(195, 167, 105)',
-            addCartBackgroundColor: 'rgb(243, 238, 225)',
-            activedStyle: {
-              color: 'rgb(195, 167, 105)',
-              borderColor: 'rgb(195, 167, 105)',
-              backgroundColor: 'rgba(195, 167, 105,0.1)'
-            }
-          },
-          // 浅绿色主题
-          green: {
-            priceColor: 'rgb(99, 190, 114)',
-            buyNowColor: '#ffffff',
-            buyNowBackgroundColor: 'rgb(99, 190, 114)',
-            addCartColor: 'rgb(99, 190, 114)',
-            addCartBackgroundColor: 'rgb(225, 244, 227)',
-            activedStyle: {
-              color: 'rgb(99, 190, 114)',
-              borderColor: 'rgb(99, 190, 114)',
-              backgroundColor: 'rgba(99, 190, 114,0.1)'
-            }
-          }
-        }
-      };
-    },
-    created() {
-      let that = this;
-      vk = that.vk;
-      if (that.valueCom) {
-        that.open();
-      }
-	  this.userInfo = uni.getStorageSync('userInfo')
-    },
-    mounted() {},
-    methods: {
-      // 初始化
-      init(notAutoClick) {
-        let that = this;
-        // 清空之前的数据
-        that.selectArr = [];
-        that.subIndex = [];
-        that.selectShop = {};
-        that.selectNum = that.minBuyNum || 1;
-        that.outFoStock = false;
-        that.shopItemInfo = {};
-        let specListName = that.specListName;
-        that.goodsInfo[specListName].map(item => {
-          that.selectArr.push('');
-          that.subIndex.push(-1);
-        });
-		console.log(notAutoClick,that.specListName)
-		console.log(that.goodsInfo)
-        that.checkItem(); // 计算sku里面规格形成路径
-        that.checkInpath(-1); // 传-1是为了不跳过循环
-        if (!notAutoClick) that.autoClickSku(); // 自动选择sku策略
-      },
-      // 使用vk路由模式框架获取商品信息
-      findGoodsInfo(obj = {}) {
-        let that = this;
-        let { useCache } = obj;
-        if (typeof vk == 'undefined') {
-          that.toast('custom-action必须是function', 'none');
-          return false;
-        }
-        let { actionTips } = that;
-        let actionTitle = '';
-        let actionAoading = false;
-        if (actionTips !== 'custom') {
-          actionTitle = useCache ? '' : '请求中...';
-        } else {
-          actionAoading = useCache ? false : true;
-        }
-        vk.callFunction({
-          url: that.action,
-          title: actionTitle,
-          loading: actionAoading,
-          data: {
-            goods_id: that.goodsId
-          },
-          success(data) {
-            that.updateGoodsInfo(data.goodsInfo);
-            // 更新缓存
-            goodsCache[that.goodsId] = data.goodsInfo;
-            that.$emit('update-goods', data.goodsInfo);
-          },
-          fail() {
-            that.updateValue(false);
-          }
-        });
-      },
-      updateValue(value) {
-        let that = this;
-        if (value) {
-          that.$emit('open', true);
-          that.$emit('input', true);
-          that.$emit('update:modelValue', true);
-        } else {
-          that.$emit('input', false);
-          that.$emit('close', 'close');
-          that.$emit('update:modelValue', false);
-        }
-      },
-      // 更新商品信息(库存、名称、图片)
-      updateGoodsInfo(goodsInfo) {
-        let that = this;
-        // goodsInfo.sku_list.map((item, index) => {
-        // 	item.sku_name_arr = ["20ml/瓶"];
-        // });
-        let { skuListName } = that;
-        if (JSON.stringify(that.goodsInfo) === '{}' || that.goodsInfo[that.goodsIdName] !== goodsInfo[that.goodsIdName]) {
-          that.goodsInfo = goodsInfo;
-          that.initKey = true;
-        } else {
-          that.goodsInfo[skuListName] = goodsInfo[skuListName];
-        }
-        if (that.initKey) {
-          that.initKey = false;
-
-          // 是否默认选中第一个SKU
-          // 条件是 单规格商品或者多规格单SKU商品
-          const skuList = that.goodsInfo[that.skuListName]
-          const autoClickSku = !that.isManyCom ? true : skuList.length === 1
-          that.init(!autoClickSku)
-        }
-        // 更新选中sku的库存信息
-        let select_sku_info = that.getListItem(that.goodsInfo[skuListName], that.skuIdName, that.selectShop[that.skuIdName]);
-        Object.assign(that.selectShop, select_sku_info);
-        that.defaultSelectSku();
-        that.complete = true;
-      },
-      async open() {
-        let that = this;
-        that.openTime = new Date().getTime();
-        let findGoodsInfoRun = true;
-        let skuListName = that.skuListName;
-        // 先获取缓存中的商品信息
-        let useCache = false;
-        let goodsInfo = goodsCache[that.goodsId];
-        if (goodsInfo && that.useCache) {
-          useCache = true;
-          that.updateGoodsInfo(goodsInfo);
-        } else {
-          that.complete = false;
-        }
-        if (that.customAction && typeof that.customAction === 'function') {
-          try {
-            goodsInfo = await that
-              .customAction({
-                useCache,
-                goodsId: that.goodsId,
-                goodsInfo,
-                close: function() {
-                  setTimeout(function() {
-                    that.close();
-                  }, 500);
-                }
-              })
-              .catch(err => {
-                setTimeout(function() {
-                  that.close();
-                }, 500);
-              });
-          } catch (err) {
-            let { message = '' } = err;
-            if (message.indexOf('.catch is not a function') > -1) {
-              that.toast('custom-action必须返回一个Promise', 'none');
-              setTimeout(function() {
-                that.close();
-              }, 500);
-              return false;
-            }
-          }
-          // 更新缓存
-          goodsCache[that.goodsId] = goodsInfo;
-		  console.log("goodsCache",goodsCache[that.goodsId])
-          if (goodsInfo && typeof goodsInfo == 'object' && JSON.stringify(goodsInfo) != '{}') {
-            findGoodsInfoRun = false;
-            that.updateGoodsInfo(goodsInfo);
-            that.updateValue(true);
-          } else {
-            that.toast('未获取到商品信息', 'none');
-            that.$emit('input', false);
-            return false;
-          }
-        } else if (typeof that.localdata !== 'undefined' && that.localdata !== null) {
-          goodsInfo = that.localdata;
-          if (goodsInfo && typeof goodsInfo == 'object' && JSON.stringify(goodsInfo) != '{}') {
-            findGoodsInfoRun = false;
-            that.updateGoodsInfo(goodsInfo);
-            that.updateValue(true);
-          } else {
-            that.toast('未获取到商品信息', 'none');
-            that.$emit('input', false);
-            return false;
-          }
-        } else {
-          if (findGoodsInfoRun) that.findGoodsInfo({ useCache });
-        }
-      },
-      // 监听 - 弹出层收起
-      close(s) {
-        let that = this;
-        if (new Date().getTime() - that.openTime < 400) {
-          return false;
-        }
-        if (s == 'mask') {
-          if (that.maskCloseAble !== false) {
-            that.$emit('input', false);
-            that.$emit('close', 'mask');
-            that.$emit('update:modelValue', false);
-          }
-        } else {
-          that.$emit('input', false);
-          that.$emit('close', 'close');
-          that.$emit('update:modelValue', false);
-        }
-      },
-      moveHandle() {
-        //禁止父元素滑动
-      },
-      // sku按钮的点击事件
-      skuClick(value, index1, index2,item) {
-        let that = this;
-        if (value.ishow) {
-          if (that.selectArr[index1] != value.name) {
-            that.$set(that.selectArr, index1, value.name);
-            that.$set(that.subIndex, index1, index2);
-          } else {
-            that.$set(that.selectArr, index1, '');
-            that.$set(that.subIndex, index1, -1);
-          }
-		  this.$emit('selectedOld',{title:item,value:value,})
-          that.checkInpath(index1);
-          // 如果全部选完
-          that.checkSelectShop();
-        }
-      },
-      // 检测是否已经选完sku
-      checkSelectShop() {
-        let that = this;
-        // 如果全部选完
-        if (that.selectArr.every(item => item != '')) {
-          that.selectShop = that.shopItemInfo[that.getArrayToSting(that.selectArr)];
-          let stock = that.selectShop[that.stockName];
-          if (typeof stock !== 'undefined' && that.selectNum > stock) {
-            that.selectNum = stock;
-          }
-          if (that.selectNum > that.maxBuyNum) {
-            that.selectNum = that.maxBuyNum;
-          }
-          if (that.selectNum < that.minBuyNum) {
-            that.selectNum = that.minBuyNum;
-          }
-          if (that.selectedInit) {
-            that.selectNum = that.minBuyNum || 1;
-          }
-        } else {
-          that.selectShop = {};
-        }
-		// uni.$emit("checkSelectShop",that.selectShop)
-      },
-      // 检查路径
-      checkInpath(clickIndex) {
-        let that = this;
-        let specListName = that.specListName;
-        //console.time('筛选可选路径需要的时间是');
-        //循环所有属性判断哪些属性可选
-        //当前选中的兄弟节点和已选中属性不需要循环
-        let specList = that.goodsInfo[specListName];
-        for (let i = 0, len = specList.length; i < len; i++) {
-          if (i == clickIndex) {
-            continue;
-          }
-          let len2 = specList[i].list.length;
-          for (let j = 0; j < len2; j++) {
-            if (that.subIndex[i] != -1 && j == that.subIndex[i]) {
-              continue;
-            }
-            let choosed_copy = [...that.selectArr];
-            that.$set(choosed_copy, i, specList[i].list[j].name);
-            let choosed_copy2 = choosed_copy.filter(item => item !== '' && typeof item !== 'undefined');
-            if (that.shopItemInfo.hasOwnProperty(that.getArrayToSting(choosed_copy2))) {
-              specList[i].list[j].ishow = true;
-            } else {
-              specList[i].list[j].ishow = false;
-            }
-          }
-        }
-        that.$set(that.goodsInfo, specListName, specList);
-        // console.timeEnd('筛选可选路径需要的时间是');
-      },
-      // 计算sku里面规格形成路径
-      checkItem() {
-        let that = this;
-        // console.time('计算有多小种可选路径需要的时间是');
-        let { stockName } = that;
-        let skuListName = that.skuListName;
-        // 去除库存小于等于0的商品sku
-        let originalSkuList = that.goodsInfo[skuListName];
-        let skuList = [];
-        let stockNum = 0;
-        originalSkuList.map((skuItem, index) => {
-          if (skuItem[stockName] > 0) {
-            skuList.push(skuItem);
-            stockNum += skuItem[stockName];
-          }
-        });
-        if (stockNum <= 0) {
-          that.outFoStock = true;
-        }
-        // 计算有多小种可选路径
-        let result = skuList.reduce(
-          (arrs, items) => {
-            return arrs.concat(
-              items[that.skuArrName].reduce(
-                (arr, item) => {
-                  return arr.concat(
-                    arr.map(item2 => {
-                      // 利用对象属性的唯一性实现二维数组去重
-                      //console.log(1,that.shopItemInfo,that.getArrayToSting([...item2, item]),item2,item,items);
-                      if (!that.shopItemInfo.hasOwnProperty(that.getArrayToSting([...item2, item]))) {
-                        that.shopItemInfo[that.getArrayToSting([...item2, item])] = items;
-                      }
-                      return [...item2, item];
-                    })
-                  );
-                },
-                [
-                  []
-                ]
-              )
-            );
-          },
-          [
-            []
-          ]
-        );
-        // console.timeEnd('计算有多小种可选路径需要的时间是');
-      },
-      getArrayToSting(arr) {
-        let str = '';
-        arr.map((item, index) => {
-          item = item.replace(/\./g, '。');
-          if (index == 0) {
-            str += item;
-          } else {
-            str += ',' + item;
-          }
-        });
-        return str;
-      },
-      // 检测sku选项是否已全部选完,且有库存
-      checkSelectComplete(obj = {}) {
-        let that = this;
-        let clickTime = new Date().getTime();
-        if (that.clickTime && clickTime - that.clickTime < 400) {
-          return false;
-        }
-        that.clickTime = clickTime;
-        let { selectShop, selectNum, stockText, stockName } = that;
-        if (!selectShop || !selectShop[that.skuIdName]) {
-          that.toast('请先选择对应规格', 'none');
-          return false;
-        }
-        if (selectNum <= 0) {
-          that.toast('购买数量必须>0', 'none');
-          return false;
-        }
-        // 判断库存
-        if (selectNum > selectShop[stockName]) {
-          that.toast(stockText + '不足', 'none');
-          return false;
-        }
-        if (typeof obj.success == 'function') obj.success(selectShop);
-      },
-      // 加入购物车
-      addCart() {
-        let that = this;
-        that.checkSelectComplete({
-          success: function(selectShop) {
-            selectShop.buy_num = that.selectNum;
-            that.$emit('add-cart', selectShop);
-            that.$emit('cart', selectShop);
-          }
-        });
-      },
-      // 立即购买
-      buyNow() {
-        let that = this;
-        that.checkSelectComplete({
-          success: function(selectShop) {
-			  selectShop.buy_num = that.selectNum;
-			  console.log(selectShop)
-			  that.$emit('buy-now', selectShop);
-			  that.$emit('buy', selectShop);
-          }
-        });
-      },
-      // 弹窗
-      toast(title, icon) {
-        uni.showToast({
-          title: title,
-          icon: icon
-        });
-      },
-      // 获取对象数组中的某一个item,根据指定的键值
-      getListItem(list, key, value) {
-        let that = this;
-        let item;
-        for (let i in list) {
-          if (typeof value == 'object') {
-            if (JSON.stringify(list[i][key]) === JSON.stringify(value)) {
-              item = list[i];
-              break;
-            }
-          } else {
-            if (list[i][key] === value) {
-              item = list[i];
-              break;
-            }
-          }
-        }
-        return item;
-      },
-      getListIndex(list, key, value) {
-        let that = this;
-        let index = -1;
-        for (let i = 0; i < list.length; i++) {
-          if (list[i][key] === value) {
-            index = i;
-            break;
-          }
-        }
-        return index;
-      },
-      // 自动选择sku前提是只有一组sku,默认自动选择最前面的有库存的sku
-      autoClickSku() {
-        let that = this;
-        let { stockName } = that;
-        let skuList = that.goodsInfo[that.skuListName];
-        let specListArr = that.goodsInfo[that.specListName];
-        if (specListArr.length == 1) {
-          let specList = specListArr[0].list;
-          for (let i = 0; i < specList.length; i++) {
-            let sku = that.getListItem(skuList, that.skuArrName, [specList[i].name]);
-            if (sku && sku[stockName] > 0) {
-              that.skuClick(specList[i], 0, i);
-              break;
-            }
-          }
-        }
-      },
-      // 主题颜色
-      themeColorFn(name) {
-        let that = this;
-        let { theme, themeColor } = that;
-        let color = that[name] ? that[name] : themeColor[theme][name];
-        return color;
-      },
-      defaultSelectSku() {
-        let that = this;
-        let { defaultSelect } = that;
-        if (defaultSelect && defaultSelect.sku && defaultSelect.sku.length > 0) {
-          that.selectSku(defaultSelect);
-        }
-      },
-      /**
-      	 * 主动方法 - 设置sku
-      	that.$refs.skuPopup.selectSku({
-      		sku:["红色","256G","公开版"],
-      		num:5
-      	});
-      	 */
-      selectSku(obj = {}) {
-        let that = this;
-        let { sku: skuArr, num: selectNum } = obj;
-        let specListArr = that.goodsInfo[that.specListName];
-        if (skuArr && specListArr.length === skuArr.length) {
-          // 先清空
-          let skuClickArr = [];
-          let clickKey = true;
-          for (let index = 0; index < skuArr.length; index++) {
-            let skuName = skuArr[index];
-            let specList = specListArr[index].list;
-            let index1 = index;
-            let index2 = that.getListIndex(specList, 'name', skuName);
-            if (index2 == -1) {
-              clickKey = false;
-              break;
-            }
-            skuClickArr.push({
-              spec: specList[index2],
-              index1: index1,
-              index2: index2
-            });
-          }
-          if (clickKey) {
-            that.init(true);
-            skuClickArr.map(item => {
-              that.skuClick(item.spec, item.index1, item.index2);
-            });
-          }
-        }
-        if (selectNum > 0) that.selectNum = selectNum;
-      },
-      priceFilter(n = 0) {
-        let that = this;
-        if (typeof n == 'string') {
-          n = parseFloat(n);
-        }
-        if (that.amountType === 0) {
-          return n.toFixed(2);
-        } else {
-          return (n / 100).toFixed(2);
-        }
-      },
-      pushGoodsCache(goodsInfo) {
-        let that = this;
-        let { goodsIdName } = that;
-        goodsCache[goodsInfo[goodsIdName]] = goodsInfo;
-      },
-      // 用于阻止冒泡
-      stop() {},
-      // 图片预览
-      previewImage() {
-        let that = this;
-        let { selectShop, goodsInfo, goodsThumbName } = that;
-        let src = selectShop.image ? selectShop.image : goodsInfo[goodsThumbName];
-        if (src) {
-          uni.previewImage({
-            urls: [src]
-          });
-        }
-      },
-      getMaxStock() {
-        let maxStock = 0;
-        let that = this;
-        let { selectShop = {}, goodsInfo = {}, skuListName, stockName } = that;
-        if (selectShop[stockName]) {
-          maxStock = selectShop[stockName];
-        } else {
-          let skuList = goodsInfo[skuListName];
-          if (skuList && skuList.length > 0) {
-            let valueArr = [];
-            skuList.map((skuItem, index) => {
-              valueArr.push(skuItem[stockName]);
-            });
-            let max = Math.max(...valueArr);
-            maxStock = max;
-          }
-        }
-        return maxStock;
-      },
-      numChange(e) {
-        this.$emit("num-change", e.value);
-      }
-    },
-    // 计算属性
-    computed: {
-      valueCom() {
-        // #ifndef VUE3
-        return this.value;
-        // #endif
-
-        // #ifdef VUE3
-        return this.modelValue;
-        // #endif
-      },
-      // 最大购买数量
-      maxBuyNumCom() {
-        let that = this;
-        let maxStock = that.getMaxStock();
-        let max = that.maxBuyNum || 100000;
-        // 最大购买量不能超过当前商品的库存
-        if (max > maxStock) {
-          max = maxStock;
-        }
-        return max;
-      },
-      // 是否是多规格
-      isManyCom() {
-        let that = this;
-        let { goodsInfo, defaultSingleSkuName, specListName } = that;
-        let isMany = true;
-        if (
-          goodsInfo[specListName] &&
-          goodsInfo[specListName].length === 1 &&
-          goodsInfo[specListName][0].list.length === 1 &&
-          goodsInfo[specListName][0].name === defaultSingleSkuName
-        ) {
-          isMany = false;
-        }
-        return isMany;
-      },
-      // 默认价格区间计算
-      priceCom() {
-        let str = '';
-        let that = this;
-        let { selectShop = {}, goodsInfo = {}, skuListName, skuIdName } = that;
-        if (selectShop[skuIdName]) {
-          str = that.priceFilter(selectShop.price);
-        } else {
-          let skuList = goodsInfo[skuListName];
-          if (skuList && skuList.length > 0) {
-            let valueArr = [];
-            skuList.map((skuItem, index) => {
-              valueArr.push(skuItem.price);
-            });
-            let min = that.priceFilter(Math.min(...valueArr));
-            let max = that.priceFilter(Math.max(...valueArr));
-            if (min === max) {
-              str = min + '';
-            } else {
-              str = `${min} - ${max}`;
-            }
-          }
-        }
-        return str;
-      },
-      // 库存显示
-      stockCom() {
-        let str = '';
-        let that = this;
-        let { selectShop = {}, goodsInfo = {}, skuListName, stockName } = that;
-        if (selectShop[stockName]) {
-          str = selectShop[stockName];
-        } else {
-          let skuList = goodsInfo[skuListName];
-          if (skuList && skuList.length > 0) {
-            let valueArr = [];
-            skuList.map((skuItem, index) => {
-              valueArr.push(skuItem[stockName]);
-            });
-            let min = Math.min(...valueArr);
-            let max = Math.max(...valueArr);
-            if (min === max) {
-              str = min;
-            } else {
-              str = `${min} - ${max}`;
-            }
-          }
-        }
-        return str;
-      }
-    },
-    watch: {
-      valueCom(newVal, oldValue) {
-        let that = this;
-        if (newVal) {
-          that.open();
-        }
-      },
-      defaultGoods: {
-        immediate: true,
-        handler: function(newVal, oldValue) {
-          let that = this;
-          let { goodsIdName } = that;
-          if (typeof newVal === 'object' && newVal && newVal[goodsIdName] && !goodsCache[newVal[goodsIdName]]) {
-            that.pushGoodsCache(newVal);
-          }
-        }
-      }
-    }
-  };
-</script>
-
-<style lang="scss" scoped>
-  /*  sku弹出层 */
-  .goods-sku-popup {
-    position: fixed;
-    left: var(--window-left);
-    right: var(--window-right);
-    bottom: var(--window-bottom);
-    top: var(--window-top);
-    z-index: 21;
-    overflow: hidden;
-
-    &.show {
-      display: block;
-
-      .mask {
-        animation: showPopup 0.2s linear both;
-      }
-
-      .layer {
-        animation: showLayer 0.2s linear both;
-        bottom: var(--window-bottom);
-      }
-    }
-
-    &.hide {
-      .mask {
-        animation: hidePopup 0.2s linear both;
-      }
-
-      .layer {
-        animation: hideLayer 0.2s linear both;
-      }
-    }
-
-    &.none {
-      display: none;
-    }
-
-    .mask {
-      position: fixed;
-      left: var(--window-left);
-      right: var(--window-right);
-      top: 0;
-      width: 100%;
-      height: 100%;
-      z-index: 1;
-      background-color: rgba(0, 0, 0, 0.65);
-    }
-
-    .layer {
-      display: flex;
-      flex-direction: column;
-      position: fixed;
-      left: var(--window-left);
-      right: var(--window-right);
-      bottom: var(--window-bottom);
-      z-index: 99;
-      border-radius: 10rpx 10rpx 0 0;
-      background-color: #fff;
-      // 设置ios刘海屏底部横线安全区域
-      padding-bottom: constant(safe-area-inset-bottom);
-      padding-bottom: env(safe-area-inset-bottom);
-
-      .specification-wrapper {
-        width: 100%;
-        padding: 30rpx 25rpx;
-        box-sizing: border-box;
-
-        .specification-wrapper-content {
-          width: 100%;
-          max-height: 900rpx;
-          min-height: 300rpx;
-
-          &::-webkit-scrollbar {
-            /*隐藏滚轮*/
-            display: none;
-          }
-
-          .specification-header {
-            width: 100%;
-            display: flex;
-            flex-direction: row;
-            position: relative;
-            margin-bottom: 40rpx;
-
-            .specification-left {
-              width: 180rpx;
-              height: 180rpx;
-              flex: 0 0 180rpx;
-
-              .product-img {
-                width: 180rpx;
-                height: 180rpx;
-              }
-            }
-
-            .specification-right {
-              flex: 1;
-              padding: 0 35rpx 10rpx 28rpx;
-              box-sizing: border-box;
-              display: flex;
-              flex-direction: column;
-              justify-content: flex-end;
-              font-weight: 500;
-
-              .price-content {
-                color: #fe560a;
-                margin-bottom: 10rpx;
-
-                .sign {
-                  font-size: 28rpx;
-                  margin-right: 4rpx;
-                }
-
-                .price {
-                  margin-left: 4rpx;
-                  font-size: 48rpx;
-                }
-
-                .price2 {
-                  margin-left: 4rpx;
-                  font-size: 36rpx;
-                }
-              }
-
-              .inventory {
-                font-size: 24rpx;
-                color: #525252;
-                margin-bottom: 14rpx;
-              }
-
-              .choose {
-                font-size: 24rpx;
-                color: #525252;
-                min-height: 32rpx;
-              }
-            }
-          }
-
-          .specification-content {
-            font-weight: 500;
-
-            .specification-item {
-              margin-bottom: 40rpx;
-
-              &:last-child {
-                margin-bottom: 0;
-              }
-
-              .item-title {
-                margin-bottom: 20rpx;
-                font-size: 28rpx;
-                color: #999999;
-              }
-
-              .item-wrapper {
-                display: flex;
-                flex-direction: row;
-                flex-flow: wrap;
-                margin-bottom: -20rpx;
-
-                .item-content {
-                  display: inline-block;
-                  padding: 10rpx 35rpx;
-                  font-size: 24rpx;
-                  border-radius: 10rpx;
-                  background-color: #ffffff;
-                  color: #333333;
-                  margin-right: 20rpx;
-                  margin-bottom: 20rpx;
-                  border: 2rpx solid #f4f4f4;
-                  box-sizing: border-box;
-
-                  &.actived {
-                    border-color: #fe560a;
-                    color: #fe560a;
-                  }
-
-                  &.noactived {
-                    // background-color: #f6f6f6;
-                    // border-color: #f6f6f6;
-                    // color: #c3c3c3;
-                    color: #c8c9cc;
-                    background: #f2f3f5;
-                    border-color: #f2f3f5;
-                  }
-                }
-              }
-            }
-
-            .number-box-view {
-              display: flex;
-              padding-top: 20rpx;
-            }
-          }
-        }
-
-        .close {
-          position: absolute;
-          top: 30rpx;
-          right: 25rpx;
-          width: 50rpx;
-          height: 50rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
-          .close-item {
-            width: 40rpx;
-            height: 40rpx;
-          }
-        }
-      }
-
-      .btn-wrapper {
-        display: flex;
-        width: 100%;
-        height: 120rpx;
-        flex: 0 0 120rpx;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 26rpx;
-        box-sizing: border-box;
-
-        .layer-btn {
-          width: 335rpx;
-          height: 76rpx;
-          border-radius: 38rpx;
-          color: #fff;
-          font-weight: 500;
-          font-size: 28rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
-          &.add-cart {
-            background: #ffbe46;
-          }
-
-          &.buy {
-            background: #fe560a;
-          }
-        }
-
-        .sure {
-          margin: 0 auto;
-          width: 95%;
-          max-width: 1200rpx;
-          height: 80rpx;
-          border-radius: 38rpx;
-          color: #fff;
-          font-weight: 500;
-          font-size: 28rpx;
-          background: #fe560a;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        }
-
-        .sure.add-cart {
-          background: #ff9402;
-        }
-      }
-
-      .btn-wrapper.safe-area-inset-bottom {
-        padding-bottom: 0;
-        padding-bottom: constant(safe-area-inset-bottom);
-        padding-bottom: env(safe-area-inset-bottom);
-      }
-    }
-
-    @keyframes showPopup {
-      0% {
-        opacity: 0;
-      }
-
-      100% {
-        opacity: 1;
-      }
-    }
-
-    @keyframes hidePopup {
-      0% {
-        opacity: 1;
-      }
-
-      100% {
-        opacity: 0;
-      }
-    }
-
-    @keyframes showLayer {
-      0% {
-        transform: translateY(120%);
-      }
-
-      100% {
-        transform: translateY(0%);
-      }
-    }
-
-    @keyframes hideLayer {
-      0% {
-        transform: translateY(0);
-      }
-
-      100% {
-        transform: translateY(120%);
-      }
-    }
-  }
-</style>
\ No newline at end of file
+<template>
+	<view class="goods-sku-popup" catchtouchmove="true" :class="valueCom && complete ? 'show' : 'none'"
+		@touchmove.stop.prevent="moveHandle" @click.stop="stop">
+		<!-- 页面内容开始 -->
+		<view class="mask" @click="close('mask')"></view>
+		<view class="layer attr-content" :class="{'safe-area-inset-bottom':safeAreaInsetBottom }"
+			:style="{ borderRadius: borderRadius + 'rpx ' + borderRadius + 'rpx 0 0' }">
+			<view class="specification-wrapper">
+				<scroll-view class="specification-wrapper-content" scroll-y="true">
+					<view class="specification-header">
+						<view class="specification-left">
+							<image class="product-img"
+								:src="selectShop.image ? selectShop.image : goodsInfo[goodsThumbName]"
+								:style="{ backgroundColor: goodsThumbBackgroundColor }" mode="aspectFill"
+								@click="previewImage"></image>
+						</view>
+						<view class="specification-right">
+							<view class="price-content" :style="{ color: themeColorFn('priceColor') }">
+								<text class="sign">¥</text>
+								<text class="price" :class="priceCom.length > 16 ? 'price2' : ''">{{ priceCom }}</text>
+							</view>
+							<view class="inventory" v-if="!hideStock">{{ stockText }}：{{ stockCom }}</view>
+							<view class="inventory" v-else></view>
+							<view class="choose" v-show="isManyCom">
+								<text v-if="!selectArr.every(val => val == '')">已选：{{ selectArr.join(' ') }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="specification-content">
+						<view v-show="isManyCom" class="specification-item"
+							v-for="(item, index1) in goodsInfo[specListName]" :key="index1">
+							<view class="item-title">{{ item.name }}</view>
+							<view class="item-wrapper">
+								<view class="item-content" v-for="(item_value, index2) in item.list" :key="index2"
+									:class="[item_value.ishow ? '' : 'noactived', subIndex[index1] == index2 ? 'actived' : '']"
+									:style="[
+										item_value.ishow ? '' : themeColorFn('disableStyle'),
+										item_value.ishow ? themeColorFn('btnStyle') : '',
+										subIndex[index1] == index2 ? themeColorFn('activedStyle') : ''
+									]" @click="skuClick(item_value, index1, index2,item)">
+									{{ item_value.name }}
+								</view>
+							</view>
+						</view>
+						<view class="number-box-view" v-if="!userInfo.user_type || userInfo.user_type != 40">
+							<view style="flex: 1;">数量</view>
+							<view style="flex: 4;text-align: right;">
+								<number-box v-model="selectNum" :min="minBuyNum || 1" :max="maxBuyNumCom"
+									:step="stepBuyNum || 1" :step-strictly="stepStrictly" :positive-integer="true"
+									@change="numChange" />
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="close" @click="close('close')" v-if="showClose != false">
+					<image class="close-item" :src="closeImage"></image>
+				</view>
+			</view>
+
+			<view class="btn-wrapper" v-if="outFoStock || mode == 4">
+				<view class="sure" style="color:#ffffff;background-color:#cccccc">{{ noStockText }}</view>
+			</view>
+			<view class="btn-wrapper" v-else-if="mode == 1">
+				<view class="sure add-cart" style="border-radius:38rpx 0rpx 0rpx 38rpx;" :style="{
+						color: themeColorFn('addCartColor'),
+						backgroundColor: themeColorFn('addCartBackgroundColor')
+					}" @click="addCart">
+					{{ addCartText }}
+				</view>
+
+				<view class="sure" style="border-radius:0rpx 38rpx 38rpx 0rpx;" :style="{
+						color: themeColorFn('buyNowColor'),
+						backgroundColor: themeColorFn('buyNowBackgroundColor')
+					}" @click="buyNow">
+					{{ userInfo.user_type == 40?'修改价格':buyNowText }}
+				</view>
+			</view>
+			<view class="btn-wrapper" v-else-if="mode == 2">
+				<view class="sure add-cart" :style="{
+						color: themeColorFn('addCartColor'),
+						backgroundColor: themeColorFn('addCartBackgroundColor')
+					}" @click="addCart">
+					{{ addCartText }}
+				</view>
+			</view>
+			<view class="btn-wrapper" v-else-if="mode == 3">
+				<view class="sure" :style="{
+						color: themeColorFn('buyNowColor'),
+						backgroundColor: themeColorFn('buyNowBackgroundColor')
+					}" @click="buyNow">
+					{{ userInfo.user_type == 40?'修改价格':buyNowText }}
+				</view>
+			</view>
+		</view>
+		<!-- 页面内容结束 -->
+	</view>
+</template>
+
+<script>
+	import NumberBox from './number-box'
+	var vk; // vk依赖
+	var goodsCache = {}; // 本地商品缓存
+	export default {
+		name: 'GoodsSkuPopup',
+		components: {
+			NumberBox
+		},
+		emits: ['update:modelValue', 'input', 'update-goods', 'open', 'close', 'add-cart', 'buy-now', 'cart', 'buy',
+			'num-change'
+		],
+		props: {
+			// true 组件显示 false 组件隐藏
+			value: {
+				Type: Boolean,
+				default: false
+			},
+			modelValue: {
+				Type: Boolean,
+				default: false
+			},
+			// vk云函数路由模式参数开始-----------------------------------------------------------
+			// 商品id
+			goodsId: {
+				Type: String,
+				default: ''
+			},
+			// vk路由模式框架下的云函数地址
+			action: {
+				Type: String,
+				default: ''
+			},
+			// vk云函数路由模式参数结束-----------------------------------------------------------
+			// 该商品已抢完时的按钮文字
+			noStockText: {
+				Type: String,
+				default: '该商品已抢完'
+			},
+			// 库存文字
+			stockText: {
+				Type: String,
+				default: '库存'
+			},
+			// 商品表id的字段名
+			goodsIdName: {
+				Type: String,
+				default: '_id'
+			},
+			// sku表id的字段名
+			skuIdName: {
+				Type: String,
+				default: '_id'
+			},
+			// sku_list的字段名
+			skuListName: {
+				Type: String,
+				default: 'sku_list'
+			},
+			// spec_list的字段名
+			specListName: {
+				Type: String,
+				default: 'spec_list'
+			},
+			// 库存的字段名 默认 stock
+			stockName: {
+				Type: String,
+				default: 'stock'
+			},
+			// sku组合路径的字段名
+			skuArrName: {
+				Type: String,
+				default: 'sku_name_arr'
+			},
+			// 默认单规格时的规格组名称
+			defaultSingleSkuName: {
+				Type: String,
+				default: '默认'
+			},
+			// 模式 1:都显示  2:只显示购物车 3:只显示立即购买 4:显示缺货按钮 默认 1
+			mode: {
+				Type: Number,
+				default: 1
+			},
+			// 点击遮罩是否关闭组件 true 关闭 false 不关闭 默认true
+			maskCloseAble: {
+				Type: Boolean,
+				default: true
+			},
+			// 顶部圆角值
+			borderRadius: {
+				Type: [String, Number],
+				default: 0
+			},
+			// 商品缩略图字段名(未选择sku时)
+			goodsThumbName: {
+				Type: [String],
+				default: 'goods_thumb'
+			},
+			// 商品缩略图背景颜色，如#999999
+			goodsThumbBackgroundColor: {
+				Type: String,
+				default: '#999999'
+			},
+			// 最小购买数量 默认 1
+			minBuyNum: {
+				Type: [Number, String],
+				default: 1
+			},
+			// 最大购买数量 默认 100000
+			maxBuyNum: {
+				Type: [Number, String],
+				default: 100000
+			},
+			// 步进器步长 默认 1
+			stepBuyNum: {
+				Type: [Number, String],
+				default: 1
+			},
+			// 是否只能输入 step 的倍数
+			stepStrictly: {
+				Type: Boolean,
+				default: false
+			},
+			// 自定义获取商品信息的函数,支付宝小程序不支持该属性,请使用localdata属性
+			customAction: {
+				Type: [Function],
+				default: null
+			},
+			// 本地数据源
+			localdata: {
+				type: Object
+			},
+			// 价格的字体颜色
+			priceColor: {
+				Type: String
+			},
+			// 立即购买按钮的文字
+			buyNowText: {
+				Type: String,
+				default: '立即购买'
+			},
+			// 立即购买按钮的字体颜色
+			buyNowColor: {
+				Type: String
+			},
+			// 立即购买按钮的背景颜色
+			buyNowBackgroundColor: {
+				Type: String
+			},
+			// 加入购物车按钮的文字
+			addCartText: {
+				Type: String,
+				default: '加入购物车'
+			},
+			// 加入购物车按钮的字体颜色
+			addCartColor: {
+				Type: String
+			},
+			// 加入购物车按钮的背景颜色
+			addCartBackgroundColor: {
+				Type: String
+			},
+			// 不可点击时,按钮的样式
+			disableStyle: {
+				Type: Object,
+				default: null
+			},
+			// 按钮点击时的样式
+			activedStyle: {
+				Type: Object,
+				default: null
+			},
+			// 按钮常态的样式
+			btnStyle: {
+				Type: Object,
+				default: null
+			},
+			// 是否显示右上角关闭按钮
+			showClose: {
+				Type: Boolean,
+				default: true
+			},
+			// 关闭按钮的图片地址 https://img.alicdn.com/imgextra/i1/121022687/O1CN01ImN0O11VigqwzpLiK_!!121022687.png
+			closeImage: {
+				Type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAEyUlEQVR42sSZeWwNURTGp4OqtBo7sSXELragdkpQsRRJ1Zr4hyJiJ9YgxNIg1qANiT+E1i5IY0kVVWtQEbuEKLFGUSH27/ANN5PXmTvzupzkl/tm8t6b7517lnvvC0lKSjJ8WmnQAUSDFqABqALKgl8gD7wE90E2SAeXwFf1SxISErQeVtKHwCgwFsSDSIf3hYFKoCkYDBaDdyAViHdueHmoF6FtwDLQ23b/E7gM7oIcejIERIDaoBFoC8qA8mA8SQNz6W1XC9GY+nCQCCYAk/c+gF0gBZwH312+IxR0BCPBUIaH2A+wHsxHCHxx+gLT5QGN6a2JfG8uvVCDws9oiDQYlxkMGfHyQvARlADTwcXk5OT6foV2kS8ATXidymlcyen1a/Jjl9IJh3hPkjELYqO8Cu0KjjNZvtETw5jFBWXPmGSTGQKSeOn5iQ0kVLL0CINfPNcPbDMKyRCbGzEMBJ+ZD8cChYFdqGTqfsWT8otPGoVsEHsMwxDFs3shNsxJ6BrQ0Po8OGUUkVHsNCVml+cntB1jUWwn2GEUsTEMrASbDK+2CCQ0kYX6nfLLisMmKqUr0S60M+jG10vAm+JSCa8+x7CKlzHwaktV6DiObzUzPJIxFO1BQ12wGtTReO9GetVgY/kjNJzZbcWmTjHfxw51AsRqvL8eOAtmsJuFu3g1l+1ZLB5eDTVZ3K0P7tL0TkWOpSg61kVkBtuuNRthGs+wtJST5aQI7cEbkkRXNYVKgX6kIdYuUhYzMQwxN8tiExCLFqHNeSF9/aem0BzGp5PYQCJ7c/Gsk1RfuSD6U1dNpcDf9ZigTmKbMRZ9iVTsHscGJluW2FMf1SSQWGnBmaB6kCJVTVVNJZE++Cx9drEllS1KMCINpURFmEbBWA63Fz9s95cGIdJgp/zXmT4pZcOvSUzuZttTbblmnc3PIjjmidDXvKgdhMh0JdbzuCjWrbNOVovjS5P7bkPJ/mBESkz2BO0166ybNeJ431S2q+01NntuIq3E0amzjiZtk9tssWyTDzO4525bACK9NAUn68TtkNhpEXpOSagRml+S6iLSSeweHv242Qhl13rRyvoDvDlKyTQny/ZQJ+1iH7vVbEx7OR5UiKVIO7VicgvHCtwrudloMIV7/0uadVYW57O4Wvvi8v4pymlKkrpwvsDeLLZAY2pkwbAB3PSQfC+4cH7l4k1ZH8zkZRq8ecO+Z5rN40JJqnXFuGfaxPCTLjcn0OZOpnArXw8HY4paIbw5CcMgXq6HN2/mt6+XGLrN15tBryIUGavMpCTrfKcDCKkAceA9S8nhAOehhSUyhXpkBxxnP4YM1InugP7cBkjBPcqVUWFYCEROxXiQz5JlXV+IfKh7mpfJac+lZ6V87QXVClBkTc7YWsWTPSDyitfzUTlJlj8TbvE6jluDOdwZ+jX57GLO3ADeuyZrDYi86vV81FD2UVGsmT+5Zl0BnkhoseOEaogL46pqO4v/IqUEyalIR4h85BgjHv6+aUWRMbb7EstX6O0cpT1Gco0ry8fWygLDMjmDnQeBt3Qe7uVfkeugDwVLcsVzGsuwLXbV+I63XNAkG5r/hvgRqgqWs6pJPKrsbvz/Q6yyun0w/h6lP+BnzrCpfPMT2L8FGAA7k1GZ/vnaqAAAAABJRU5ErkJggg=='
+			},
+			// 是否隐藏库存显示
+			hideStock: {
+				Type: Boolean,
+				default: false
+			},
+			// 颜色主题
+			theme: {
+				Type: String,
+				default: 'default'
+			},
+			// 请求中的提示
+			actionTips: {
+				Type: String,
+				default: '请求中...'
+			},
+			// 默认选中的SKU
+			defaultSelect: {
+				Type: Object
+			},
+			// 是否使用缓存
+			useCache: {
+				Type: Boolean,
+				default: true
+			},
+			/**
+			 * 默认商品,设置该值可快速展示商品
+			 * 逻辑: 先展示 defaultGoods 信息,再取数据库,再更新页面(通常为更新库存)
+			 */
+			defaultGoods: {
+				Type: Object
+			},
+			/**
+			 * 金额是否需要除以100
+			 * 1:金额会除以100
+			 * 0:金额不会除以100
+			 */
+			amountType: {
+				Type: Number,
+				default: 1
+			},
+			// 每次选择完SKU后，购买数量归1，如果有最小购买数量，则设置为最小购买数量
+			selectedInit: {
+				Type: Boolean,
+				default: false
+			},
+			// 是否开启底部安全区适配，默认true
+			safeAreaInsetBottom: {
+				Type: Boolean,
+				default: true
+			},
+		},
+		data() {
+			return {
+				skuItem: '',
+				userInfo: {},
+				complete: false, // 组件是否加载完成
+				goodsInfo: {}, // 商品信息
+				isShow: false, // true 显示 false 隐藏
+				initKey: true, // 是否需要初始化 true 是 false 否
+				// #ifndef MP-BAIDU
+				shopItemInfo: {}, // 存放要和选中的值进行匹配的数据（因百度小程序setData不支持中文字段，故不编译shopItemInfo变量）
+				// #endif
+				selectArr: [], // 存放被选中的值
+				subIndex: [], // 是否选中 因为不确定是多规格还是单规格，所以这里定义数组来判断
+				selectShop: {}, // 存放最后选中的商品
+				selectNum: this.minBuyNum || 1, // 选中数量
+				outFoStock: false, // 是否全部sku都缺货
+				openTime: 0,
+				themeColor: {
+					// 默认主题
+					default: {
+						priceColor: 'rgb(254, 86, 10)',
+						buyNowColor: '#ffffff',
+						buyNowBackgroundColor: 'rgb(254, 86, 10)',
+						addCartColor: '#ffffff',
+						addCartBackgroundColor: 'rgb(255, 148, 2)',
+						btnStyle: {
+							color: '#333333',
+							borderColor: '#f4f4f4',
+							backgroundColor: '#ffffff'
+						},
+						activedStyle: {
+							color: 'rgb(254, 86, 10)',
+							borderColor: 'rgb(254, 86, 10)',
+							backgroundColor: 'rgba(254,86,10,0.1)'
+						},
+						disableStyle: {
+							color: '#c3c3c3',
+							borderColor: '#f6f6f6',
+							backgroundColor: '#f6f6f6'
+						}
+					},
+					// 红黑主题
+					'red-black': {
+						priceColor: 'rgb(255, 68, 68)',
+						buyNowColor: '#ffffff',
+						buyNowBackgroundColor: 'rgb(255, 68, 68)',
+						addCartColor: '#ffffff',
+						addCartBackgroundColor: 'rgb(85, 85, 85)',
+						activedStyle: {
+							color: 'rgb(255, 68, 68)',
+							borderColor: 'rgb(255, 68, 68)',
+							backgroundColor: 'rgba(255,68,68,0.1)'
+						}
+					},
+					// 黑白主题
+					'black-white': {
+						priceColor: 'rgb(47, 47, 52)',
+						buyNowColor: '#ffffff',
+						buyNowBackgroundColor: 'rgb(47, 47, 52)',
+						addCartColor: 'rgb(47, 47, 52)',
+						addCartBackgroundColor: 'rgb(235, 236, 242)',
+						// btnStyle:{
+						// 	color:"rgb(47, 47, 52)",
+						// 	borderColor:"rgba(235,236,242,0.5)",
+						// 	backgroundColor:"rgba(235,236,242,0.5)",
+						// },
+						activedStyle: {
+							color: 'rgb(47, 47, 52)',
+							borderColor: 'rgba(47,47,52,0.12)',
+							backgroundColor: 'rgba(47,47,52,0.12)'
+						}
+					},
+					// 咖啡色主题
+					coffee: {
+						priceColor: 'rgb(195, 167, 105)',
+						buyNowColor: '#ffffff',
+						buyNowBackgroundColor: 'rgb(195, 167, 105)',
+						addCartColor: 'rgb(195, 167, 105)',
+						addCartBackgroundColor: 'rgb(243, 238, 225)',
+						activedStyle: {
+							color: 'rgb(195, 167, 105)',
+							borderColor: 'rgb(195, 167, 105)',
+							backgroundColor: 'rgba(195, 167, 105,0.1)'
+						}
+					},
+					// 浅绿色主题
+					green: {
+						priceColor: 'rgb(99, 190, 114)',
+						buyNowColor: '#ffffff',
+						buyNowBackgroundColor: 'rgb(99, 190, 114)',
+						addCartColor: 'rgb(99, 190, 114)',
+						addCartBackgroundColor: 'rgb(225, 244, 227)',
+						activedStyle: {
+							color: 'rgb(99, 190, 114)',
+							borderColor: 'rgb(99, 190, 114)',
+							backgroundColor: 'rgba(99, 190, 114,0.1)'
+						}
+					}
+				}
+			};
+		},
+		created() {
+			let that = this;
+			vk = that.vk;
+			if (that.valueCom) {
+				that.open();
+			}
+			this.userInfo = uni.getStorageSync('userInfo')
+		},
+		mounted() {},
+		methods: {
+			// 初始化
+			init(notAutoClick) {
+				let that = this;
+				// 清空之前的数据
+				that.selectArr = [];
+				that.subIndex = [];
+				that.selectShop = {};
+				that.selectNum = that.minBuyNum || 1;
+				that.outFoStock = false;
+				that.shopItemInfo = {};
+				let specListName = that.specListName;
+				that.goodsInfo[specListName].map(item => {
+					that.selectArr.push('');
+					that.subIndex.push(-1);
+				});
+				console.log(notAutoClick, that.specListName)
+				console.log(that.goodsInfo)
+				that.checkItem(); // 计算sku里面规格形成路径
+				that.checkInpath(-1); // 传-1是为了不跳过循环
+				if (!notAutoClick) that.autoClickSku(); // 自动选择sku策略
+			},
+			// 使用vk路由模式框架获取商品信息
+			findGoodsInfo(obj = {}) {
+				let that = this;
+				let {
+					useCache
+				} = obj;
+				if (typeof vk == 'undefined') {
+					that.toast('custom-action必须是function', 'none');
+					return false;
+				}
+				let {
+					actionTips
+				} = that;
+				let actionTitle = '';
+				let actionAoading = false;
+				if (actionTips !== 'custom') {
+					actionTitle = useCache ? '' : '请求中...';
+				} else {
+					actionAoading = useCache ? false : true;
+				}
+				vk.callFunction({
+					url: that.action,
+					title: actionTitle,
+					loading: actionAoading,
+					data: {
+						goods_id: that.goodsId
+					},
+					success(data) {
+						that.updateGoodsInfo(data.goodsInfo);
+						// 更新缓存
+						goodsCache[that.goodsId] = data.goodsInfo;
+						that.$emit('update-goods', data.goodsInfo);
+					},
+					fail() {
+						that.updateValue(false);
+					}
+				});
+			},
+			updateValue(value) {
+				let that = this;
+				if (value) {
+					that.$emit('open', true);
+					that.$emit('input', true);
+					that.$emit('update:modelValue', true);
+				} else {
+					that.$emit('input', false);
+					that.$emit('close', 'close');
+					that.$emit('update:modelValue', false);
+				}
+			},
+			// 更新商品信息(库存、名称、图片)
+			updateGoodsInfo(goodsInfo) {
+				let that = this;
+				// goodsInfo.sku_list.map((item, index) => {
+				// 	item.sku_name_arr = ["20ml/瓶"];
+				// });
+				let {
+					skuListName
+				} = that;
+				if (JSON.stringify(that.goodsInfo) === '{}' || that.goodsInfo[that.goodsIdName] !== goodsInfo[that
+						.goodsIdName]) {
+					that.goodsInfo = goodsInfo;
+					that.initKey = true;
+				} else {
+					that.goodsInfo[skuListName] = goodsInfo[skuListName];
+				}
+				if (that.initKey) {
+					that.initKey = false;
+
+					// 是否默认选中第一个SKU
+					// 条件是 单规格商品或者多规格单SKU商品
+					const skuList = that.goodsInfo[that.skuListName]
+					const autoClickSku = !that.isManyCom ? true : skuList.length === 1
+					that.init(!autoClickSku)
+				}
+				// 更新选中sku的库存信息
+				let select_sku_info = that.getListItem(that.goodsInfo[skuListName], that.skuIdName, that.selectShop[that
+					.skuIdName]);
+				Object.assign(that.selectShop, select_sku_info);
+				that.defaultSelectSku();
+				that.complete = true;
+			},
+			async open() {
+				let that = this;
+				that.openTime = new Date().getTime();
+				let findGoodsInfoRun = true;
+				let skuListName = that.skuListName;
+				// 先获取缓存中的商品信息
+				let useCache = false;
+				let goodsInfo = goodsCache[that.goodsId];
+				if (goodsInfo && that.useCache) {
+					useCache = true;
+					that.updateGoodsInfo(goodsInfo);
+				} else {
+					that.complete = false;
+				}
+				if (that.customAction && typeof that.customAction === 'function') {
+					try {
+						goodsInfo = await that
+							.customAction({
+								useCache,
+								goodsId: that.goodsId,
+								goodsInfo,
+								close: function() {
+									setTimeout(function() {
+										that.close();
+									}, 500);
+								}
+							})
+							.catch(err => {
+								setTimeout(function() {
+									that.close();
+								}, 500);
+							});
+					} catch (err) {
+						let {
+							message = ''
+						} = err;
+						if (message.indexOf('.catch is not a function') > -1) {
+							that.toast('custom-action必须返回一个Promise', 'none');
+							setTimeout(function() {
+								that.close();
+							}, 500);
+							return false;
+						}
+					}
+					// 更新缓存
+					goodsCache[that.goodsId] = goodsInfo;
+					console.log("goodsCache", goodsCache[that.goodsId])
+					if (goodsInfo && typeof goodsInfo == 'object' && JSON.stringify(goodsInfo) != '{}') {
+						findGoodsInfoRun = false;
+						that.updateGoodsInfo(goodsInfo);
+						that.updateValue(true);
+					} else {
+						that.toast('未获取到商品信息', 'none');
+						that.$emit('input', false);
+						return false;
+					}
+				} else if (typeof that.localdata !== 'undefined' && that.localdata !== null) {
+					goodsInfo = that.localdata;
+					if (goodsInfo && typeof goodsInfo == 'object' && JSON.stringify(goodsInfo) != '{}') {
+						findGoodsInfoRun = false;
+						that.updateGoodsInfo(goodsInfo);
+						that.updateValue(true);
+					} else {
+						that.toast('未获取到商品信息', 'none');
+						that.$emit('input', false);
+						return false;
+					}
+				} else {
+					if (findGoodsInfoRun) that.findGoodsInfo({
+						useCache
+					});
+				}
+			},
+			// 监听 - 弹出层收起
+			close(s) {
+				let that = this;
+				if (new Date().getTime() - that.openTime < 400) {
+					return false;
+				}
+				if (s == 'mask') {
+					if (that.maskCloseAble !== false) {
+						that.$emit('input', false);
+						that.$emit('close', 'mask');
+						that.$emit('update:modelValue', false);
+					}
+				} else {
+					that.$emit('input', false);
+					that.$emit('close', 'close');
+					that.$emit('update:modelValue', false);
+				}
+			},
+			moveHandle() {
+				//禁止父元素滑动
+			},
+			// sku按钮的点击事件
+			skuClick(value, index1, index2, item) {
+				let that = this;
+				if (value.ishow) {
+					if (that.selectArr[index1] != value.name) {
+						that.$set(that.selectArr, index1, value.name);
+						that.$set(that.subIndex, index1, index2);
+					} else {
+						that.$set(that.selectArr, index1, '');
+						that.$set(that.subIndex, index1, -1);
+					}
+					this.skuItem = item;
+					this.skuIValue = value
+					this.$emit('selectedOld', {
+						title: this.skuItem,
+						value: this.skuIValue,
+					})
+					that.checkInpath(index1);
+					// 如果全部选完
+					that.checkSelectShop();
+				}
+			},
+			// 检测是否已经选完sku
+			checkSelectShop() {
+				let that = this;
+				// 如果全部选完
+				if (that.selectArr.every(item => item != '')) {
+					that.selectShop = that.shopItemInfo[that.getArrayToSting(that.selectArr)];
+					let stock = that.selectShop[that.stockName];
+					if (typeof stock !== 'undefined' && that.selectNum > stock) {
+						that.selectNum = stock;
+					}
+					if (that.selectNum > that.maxBuyNum) {
+						that.selectNum = that.maxBuyNum;
+					}
+					if (that.selectNum < that.minBuyNum) {
+						that.selectNum = that.minBuyNum;
+					}
+					if (that.selectedInit) {
+						that.selectNum = that.minBuyNum || 1;
+					}
+				} else {
+					that.selectShop = {};
+				}
+				// uni.$emit("checkSelectShop",that.selectShop)
+			},
+			// 检查路径
+			checkInpath(clickIndex) {
+				let that = this;
+				let specListName = that.specListName;
+				//console.time('筛选可选路径需要的时间是');
+				//循环所有属性判断哪些属性可选
+				//当前选中的兄弟节点和已选中属性不需要循环
+				let specList = that.goodsInfo[specListName];
+				for (let i = 0, len = specList.length; i < len; i++) {
+					if (i == clickIndex) {
+						continue;
+					}
+					let len2 = specList[i].list.length;
+					for (let j = 0; j < len2; j++) {
+						if (that.subIndex[i] != -1 && j == that.subIndex[i]) {
+							continue;
+						}
+						let choosed_copy = [...that.selectArr];
+						that.$set(choosed_copy, i, specList[i].list[j].name);
+						let choosed_copy2 = choosed_copy.filter(item => item !== '' && typeof item !== 'undefined');
+						if (that.shopItemInfo.hasOwnProperty(that.getArrayToSting(choosed_copy2))) {
+							specList[i].list[j].ishow = true;
+						} else {
+							specList[i].list[j].ishow = false;
+						}
+					}
+				}
+				that.$set(that.goodsInfo, specListName, specList);
+				// console.timeEnd('筛选可选路径需要的时间是');
+			},
+			// 计算sku里面规格形成路径
+			checkItem() {
+				let that = this;
+				// console.time('计算有多小种可选路径需要的时间是');
+				let {
+					stockName
+				} = that;
+				let skuListName = that.skuListName;
+				// 去除库存小于等于0的商品sku
+				let originalSkuList = that.goodsInfo[skuListName];
+				let skuList = [];
+				let stockNum = 0;
+				originalSkuList.map((skuItem, index) => {
+					if (skuItem[stockName] > 0) {
+						skuList.push(skuItem);
+						stockNum += skuItem[stockName];
+					}
+				});
+				if (stockNum <= 0) {
+					that.outFoStock = true;
+				}
+				// 计算有多小种可选路径
+				let result = skuList.reduce(
+					(arrs, items) => {
+						return arrs.concat(
+							items[that.skuArrName].reduce(
+								(arr, item) => {
+									return arr.concat(
+										arr.map(item2 => {
+											// 利用对象属性的唯一性实现二维数组去重
+											//console.log(1,that.shopItemInfo,that.getArrayToSting([...item2, item]),item2,item,items);
+											if (!that.shopItemInfo.hasOwnProperty(that.getArrayToSting([...
+													item2, item
+												]))) {
+												that.shopItemInfo[that.getArrayToSting([...item2, item])] =
+													items;
+											}
+											return [...item2, item];
+										})
+									);
+								},
+								[
+									[]
+								]
+							)
+						);
+					},
+					[
+						[]
+					]
+				);
+				// console.timeEnd('计算有多小种可选路径需要的时间是');
+			},
+			getArrayToSting(arr) {
+				let str = '';
+				arr.map((item, index) => {
+					item = item.replace(/\./g, '。');
+					if (index == 0) {
+						str += item;
+					} else {
+						str += ',' + item;
+					}
+				});
+				return str;
+			},
+			// 检测sku选项是否已全部选完,且有库存
+			checkSelectComplete(obj = {}) {
+				let that = this;
+				let clickTime = new Date().getTime();
+				if (that.clickTime && clickTime - that.clickTime < 400) {
+					return false;
+				}
+				that.clickTime = clickTime;
+				let {
+					selectShop,
+					selectNum,
+					stockText,
+					stockName
+				} = that;
+				if (!selectShop || !selectShop[that.skuIdName]) {
+					that.toast('请先选择对应规格', 'none');
+					return false;
+				}
+				if (selectNum <= 0) {
+					that.toast('购买数量必须>0', 'none');
+					return false;
+				}
+				// 判断库存
+				if (selectNum > selectShop[stockName]) {
+					that.toast(stockText + '不足', 'none');
+					return false;
+				}
+				if (typeof obj.success == 'function') obj.success(selectShop);
+			},
+			// 加入购物车
+			addCart() {
+				let that = this;
+				that.checkSelectComplete({
+					success: function(selectShop) {
+						selectShop.buy_num = that.selectNum;
+						that.$emit('add-cart', selectShop);
+						that.$emit('cart', selectShop);
+						that.$emit('selectedOld', {
+							title: that.skuItem,
+							value: that.skuIValue,
+						})
+					}
+				});
+			},
+			// 立即购买
+			buyNow() {
+				let that = this;
+				that.checkSelectComplete({
+					success: function(selectShop) {
+						selectShop.buy_num = that.selectNum;
+						console.log(selectShop)
+						that.$emit('buy-now', selectShop);
+						that.$emit('buy', selectShop);
+						that.$emit('selectedOld', {
+							title: that.skuItem,
+							value: that.skuIValue,
+						})
+					}
+				});
+			},
+			// 弹窗
+			toast(title, icon) {
+				uni.showToast({
+					title: title,
+					icon: icon
+				});
+			},
+			// 获取对象数组中的某一个item,根据指定的键值
+			getListItem(list, key, value) {
+				let that = this;
+				let item;
+				for (let i in list) {
+					if (typeof value == 'object') {
+						if (JSON.stringify(list[i][key]) === JSON.stringify(value)) {
+							item = list[i];
+							break;
+						}
+					} else {
+						if (list[i][key] === value) {
+							item = list[i];
+							break;
+						}
+					}
+				}
+				return item;
+			},
+			getListIndex(list, key, value) {
+				let that = this;
+				let index = -1;
+				for (let i = 0; i < list.length; i++) {
+					if (list[i][key] === value) {
+						index = i;
+						break;
+					}
+				}
+				return index;
+			},
+			// 自动选择sku前提是只有一组sku,默认自动选择最前面的有库存的sku
+			autoClickSku() {
+				let that = this;
+				let {
+					stockName
+				} = that;
+				let skuList = that.goodsInfo[that.skuListName];
+				let specListArr = that.goodsInfo[that.specListName];
+				if (specListArr.length == 1) {
+					let specList = specListArr[0].list;
+					for (let i = 0; i < specList.length; i++) {
+						let sku = that.getListItem(skuList, that.skuArrName, [specList[i].name]);
+						if (sku && sku[stockName] > 0) {
+							that.skuClick(specList[i], 0, i);
+							break;
+						}
+					}
+				}
+			},
+			// 主题颜色
+			themeColorFn(name) {
+				let that = this;
+				let {
+					theme,
+					themeColor
+				} = that;
+				let color = that[name] ? that[name] : themeColor[theme][name];
+				return color;
+			},
+			defaultSelectSku() {
+				let that = this;
+				let {
+					defaultSelect
+				} = that;
+				if (defaultSelect && defaultSelect.sku && defaultSelect.sku.length > 0) {
+					that.selectSku(defaultSelect);
+				}
+			},
+			/**
+				 * 主动方法 - 设置sku
+				that.$refs.skuPopup.selectSku({
+					sku:["红色","256G","公开版"],
+					num:5
+				});
+				 */
+			selectSku(obj = {}) {
+				let that = this;
+				let {
+					sku: skuArr,
+					num: selectNum
+				} = obj;
+				let specListArr = that.goodsInfo[that.specListName];
+				if (skuArr && specListArr.length === skuArr.length) {
+					// 先清空
+					let skuClickArr = [];
+					let clickKey = true;
+					for (let index = 0; index < skuArr.length; index++) {
+						let skuName = skuArr[index];
+						let specList = specListArr[index].list;
+						let index1 = index;
+						let index2 = that.getListIndex(specList, 'name', skuName);
+						if (index2 == -1) {
+							clickKey = false;
+							break;
+						}
+						skuClickArr.push({
+							spec: specList[index2],
+							index1: index1,
+							index2: index2
+						});
+					}
+					if (clickKey) {
+						that.init(true);
+						skuClickArr.map(item => {
+							that.skuClick(item.spec, item.index1, item.index2);
+						});
+					}
+				}
+				if (selectNum > 0) that.selectNum = selectNum;
+			},
+			priceFilter(n = 0) {
+				let that = this;
+				if (typeof n == 'string') {
+					n = parseFloat(n);
+				}
+				if (that.amountType === 0) {
+					return n.toFixed(2);
+				} else {
+					return (n / 100).toFixed(2);
+				}
+			},
+			pushGoodsCache(goodsInfo) {
+				let that = this;
+				let {
+					goodsIdName
+				} = that;
+				goodsCache[goodsInfo[goodsIdName]] = goodsInfo;
+			},
+			// 用于阻止冒泡
+			stop() {},
+			// 图片预览
+			previewImage() {
+				let that = this;
+				let {
+					selectShop,
+					goodsInfo,
+					goodsThumbName
+				} = that;
+				let src = selectShop.image ? selectShop.image : goodsInfo[goodsThumbName];
+				if (src) {
+					uni.previewImage({
+						urls: [src]
+					});
+				}
+			},
+			getMaxStock() {
+				let maxStock = 0;
+				let that = this;
+				let {
+					selectShop = {}, goodsInfo = {}, skuListName, stockName
+				} = that;
+				if (selectShop[stockName]) {
+					maxStock = selectShop[stockName];
+				} else {
+					let skuList = goodsInfo[skuListName];
+					if (skuList && skuList.length > 0) {
+						let valueArr = [];
+						skuList.map((skuItem, index) => {
+							valueArr.push(skuItem[stockName]);
+						});
+						let max = Math.max(...valueArr);
+						maxStock = max;
+					}
+				}
+				return maxStock;
+			},
+			numChange(e) {
+				this.$emit("num-change", e.value);
+			}
+		},
+		// 计算属性
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 最大购买数量
+			maxBuyNumCom() {
+				let that = this;
+				let maxStock = that.getMaxStock();
+				let max = that.maxBuyNum || 100000;
+				// 最大购买量不能超过当前商品的库存
+				if (max > maxStock) {
+					max = maxStock;
+				}
+				return max;
+			},
+			// 是否是多规格
+			isManyCom() {
+				let that = this;
+				let {
+					goodsInfo,
+					defaultSingleSkuName,
+					specListName
+				} = that;
+				let isMany = true;
+				if (
+					goodsInfo[specListName] &&
+					goodsInfo[specListName].length === 1 &&
+					goodsInfo[specListName][0].list.length === 1 &&
+					goodsInfo[specListName][0].name === defaultSingleSkuName
+				) {
+					isMany = false;
+				}
+				return isMany;
+			},
+			// 默认价格区间计算
+			priceCom() {
+				let str = '';
+				let that = this;
+				let {
+					selectShop = {}, goodsInfo = {}, skuListName, skuIdName
+				} = that;
+				if (selectShop[skuIdName]) {
+					str = that.priceFilter(selectShop.price);
+				} else {
+					let skuList = goodsInfo[skuListName];
+					if (skuList && skuList.length > 0) {
+						let valueArr = [];
+						skuList.map((skuItem, index) => {
+							valueArr.push(skuItem.price);
+						});
+						let min = that.priceFilter(Math.min(...valueArr));
+						let max = that.priceFilter(Math.max(...valueArr));
+						if (min === max) {
+							str = min + '';
+						} else {
+							str = `${min} - ${max}`;
+						}
+					}
+				}
+				return str;
+			},
+			// 库存显示
+			stockCom() {
+				let str = '';
+				let that = this;
+				let {
+					selectShop = {}, goodsInfo = {}, skuListName, stockName
+				} = that;
+				if (selectShop[stockName]) {
+					str = selectShop[stockName];
+				} else {
+					let skuList = goodsInfo[skuListName];
+					if (skuList && skuList.length > 0) {
+						let valueArr = [];
+						skuList.map((skuItem, index) => {
+							valueArr.push(skuItem[stockName]);
+						});
+						let min = Math.min(...valueArr);
+						let max = Math.max(...valueArr);
+						if (min === max) {
+							str = min;
+						} else {
+							str = `${min} - ${max}`;
+						}
+					}
+				}
+				return str;
+			}
+		},
+		watch: {
+			valueCom(newVal, oldValue) {
+				let that = this;
+				if (newVal) {
+					that.open();
+				}
+			},
+			defaultGoods: {
+				immediate: true,
+				handler: function(newVal, oldValue) {
+					let that = this;
+					let {
+						goodsIdName
+					} = that;
+					if (typeof newVal === 'object' && newVal && newVal[goodsIdName] && !goodsCache[newVal[
+							goodsIdName]]) {
+						that.pushGoodsCache(newVal);
+					}
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/*  sku弹出层 */
+	.goods-sku-popup {
+		position: fixed;
+		left: var(--window-left);
+		right: var(--window-right);
+		bottom: var(--window-bottom);
+		top: var(--window-top);
+		z-index: 21;
+		overflow: hidden;
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.2s linear both;
+				bottom: var(--window-bottom);
+			}
+		}
+
+		&.hide {
+			.mask {
+				animation: hidePopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+
+		&.none {
+			display: none;
+		}
+
+		.mask {
+			position: fixed;
+			left: var(--window-left);
+			right: var(--window-right);
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+			background-color: rgba(0, 0, 0, 0.65);
+		}
+
+		.layer {
+			display: flex;
+			flex-direction: column;
+			position: fixed;
+			left: var(--window-left);
+			right: var(--window-right);
+			bottom: var(--window-bottom);
+			z-index: 99;
+			border-radius: 10rpx 10rpx 0 0;
+			background-color: #fff;
+			// 设置ios刘海屏底部横线安全区域
+			padding-bottom: constant(safe-area-inset-bottom);
+			padding-bottom: env(safe-area-inset-bottom);
+
+			.specification-wrapper {
+				width: 100%;
+				padding: 30rpx 25rpx;
+				box-sizing: border-box;
+
+				.specification-wrapper-content {
+					width: 100%;
+					max-height: 900rpx;
+					min-height: 300rpx;
+
+					&::-webkit-scrollbar {
+						/*隐藏滚轮*/
+						display: none;
+					}
+
+					.specification-header {
+						width: 100%;
+						display: flex;
+						flex-direction: row;
+						position: relative;
+						margin-bottom: 40rpx;
+
+						.specification-left {
+							width: 180rpx;
+							height: 180rpx;
+							flex: 0 0 180rpx;
+
+							.product-img {
+								width: 180rpx;
+								height: 180rpx;
+							}
+						}
+
+						.specification-right {
+							flex: 1;
+							padding: 0 35rpx 10rpx 28rpx;
+							box-sizing: border-box;
+							display: flex;
+							flex-direction: column;
+							justify-content: flex-end;
+							font-weight: 500;
+
+							.price-content {
+								color: #fe560a;
+								margin-bottom: 10rpx;
+
+								.sign {
+									font-size: 28rpx;
+									margin-right: 4rpx;
+								}
+
+								.price {
+									margin-left: 4rpx;
+									font-size: 48rpx;
+								}
+
+								.price2 {
+									margin-left: 4rpx;
+									font-size: 36rpx;
+								}
+							}
+
+							.inventory {
+								font-size: 24rpx;
+								color: #525252;
+								margin-bottom: 14rpx;
+							}
+
+							.choose {
+								font-size: 24rpx;
+								color: #525252;
+								min-height: 32rpx;
+							}
+						}
+					}
+
+					.specification-content {
+						font-weight: 500;
+
+						.specification-item {
+							margin-bottom: 40rpx;
+
+							&:last-child {
+								margin-bottom: 0;
+							}
+
+							.item-title {
+								margin-bottom: 20rpx;
+								font-size: 28rpx;
+								color: #999999;
+							}
+
+							.item-wrapper {
+								display: flex;
+								flex-direction: row;
+								flex-flow: wrap;
+								margin-bottom: -20rpx;
+
+								.item-content {
+									display: inline-block;
+									padding: 10rpx 35rpx;
+									font-size: 24rpx;
+									border-radius: 10rpx;
+									background-color: #ffffff;
+									color: #333333;
+									margin-right: 20rpx;
+									margin-bottom: 20rpx;
+									border: 2rpx solid #f4f4f4;
+									box-sizing: border-box;
+
+									&.actived {
+										border-color: #fe560a;
+										color: #fe560a;
+									}
+
+									&.noactived {
+										// background-color: #f6f6f6;
+										// border-color: #f6f6f6;
+										// color: #c3c3c3;
+										color: #c8c9cc;
+										background: #f2f3f5;
+										border-color: #f2f3f5;
+									}
+								}
+							}
+						}
+
+						.number-box-view {
+							display: flex;
+							padding-top: 20rpx;
+						}
+					}
+				}
+
+				.close {
+					position: absolute;
+					top: 30rpx;
+					right: 25rpx;
+					width: 50rpx;
+					height: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.close-item {
+						width: 40rpx;
+						height: 40rpx;
+					}
+				}
+			}
+
+			.btn-wrapper {
+				display: flex;
+				width: 100%;
+				height: 120rpx;
+				flex: 0 0 120rpx;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 26rpx;
+				box-sizing: border-box;
+
+				.layer-btn {
+					width: 335rpx;
+					height: 76rpx;
+					border-radius: 38rpx;
+					color: #fff;
+					font-weight: 500;
+					font-size: 28rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					&.add-cart {
+						background: #ffbe46;
+					}
+
+					&.buy {
+						background: #fe560a;
+					}
+				}
+
+				.sure {
+					margin: 0 auto;
+					width: 95%;
+					max-width: 1200rpx;
+					height: 80rpx;
+					border-radius: 38rpx;
+					color: #fff;
+					font-weight: 500;
+					font-size: 28rpx;
+					background: #fe560a;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+
+				.sure.add-cart {
+					background: #ff9402;
+				}
+			}
+
+			.btn-wrapper.safe-area-inset-bottom {
+				padding-bottom: 0;
+				padding-bottom: constant(safe-area-inset-bottom);
+				padding-bottom: env(safe-area-inset-bottom);
+			}
+		}
+
+		@keyframes showPopup {
+			0% {
+				opacity: 0;
+			}
+
+			100% {
+				opacity: 1;
+			}
+		}
+
+		@keyframes hidePopup {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0;
+			}
+		}
+
+		@keyframes showLayer {
+			0% {
+				transform: translateY(120%);
+			}
+
+			100% {
+				transform: translateY(0%);
+			}
+		}
+
+		@keyframes hideLayer {
+			0% {
+				transform: translateY(0);
+			}
+
+			100% {
+				transform: translateY(120%);
+			}
+		}
+	}
+</style>
diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue
index 9d9b438..ca482e5 100644
--- a/pages/goods/components/SkuPopup.vue
+++ b/pages/goods/components/SkuPopup.vue
@@ -184,9 +184,17 @@
 			},
 			selectedOld(e) {
 				this.selectSku = e
+				this.$emit('getSku', {
+					selectSku: this.selectSku,
+					shopNum: this.shopNum
+				})
 			},
 			numChange(e) {
 				this.shopNum = e
+				this.$emit('getSku', {
+					selectSku: this.selectSku,
+					shopNum: this.shopNum
+				})
 			},
 			// sku组件 开始-----------------------------------------------------------
 			openSkuPopup() {
@@ -194,10 +202,6 @@
 			},
 
 			closeSkuPopup() {
-				this.$emit('getSku', {
-					selectSku: this.selectSku,
-					shopNum: this.shopNum
-				})
 				// console.log("监听 - 关闭sku组件")
 			},
 
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 5713b39..4d4bc1a 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -117,17 +117,17 @@
 			</view>
 		</view>
 		<view class="orderInfo">
-			<view class="chosed" v-if="goods.spec_type == 20" @click="choseSku(3)">
+			<view class="chosed" v-if="goods.spec_type == 20" @click="stockValue=='有货'?choseSku(3):''">
 				<view class="title">已选</view>
 				<view class="info" style="justify-content: flex-start;" v-if="goods.skuList.length>0">
 					<text
 						style="margin-right: 10rpx;">{{selectSku.title.name}}-{{selectSku.value.name}}</text>{{selectShop}}件
 				</view>
-				<u-icon name="arrow-right" color="#B7B7B7"></u-icon>
+				<u-icon name="arrow-right" color="#B7B7B7" v-if="stockValue=='有货'"></u-icon>
 			</view>
-			<view class="chosed" v-else @click="choseSku(3)">
+			<view class="chosed" v-else @click="stockValue=='有货'?choseSku(3):''">
 				<view class="title">已选</view>
-				<view class="info">{{selectShop}}件</view>
+				<view class="info">{{selectNum}}件</view>
 				<u-icon name="arrow-right" color="#B7B7B7"></u-icon>
 			</view>
 			<view class="chosed" v-if="goods.skuList && goods.skuList.length > 0 && goods.skuList[0].stock_num > 0">
@@ -284,12 +284,15 @@
 							<template v-if="isSeckill">
 								<template v-if="isBuy">
 									<template v-if="seckillText=='距离'">
-										<view class="addCar" @click="choseSku(2)">
+										<view class="addCar" @click="choseSku(2)" v-if="stockValue=='有货'">
 											加入购物车
 										</view>
-										<view class="buyNow" @click="choseSku(3)">
+										<view class="buyNow" @click="choseSku(3)" v-if="stockValue=='有货'">
 											立即购买
 										</view>
+										<view class="btn-bg" v-if="stockValue=='无货'">
+											无货
+										</view>
 									</template>
 									<template v-else>
 										<view class="btn-bg">
@@ -304,12 +307,15 @@
 								</template>
 							</template>
 							<template v-else>
-								<view class="addCar" @click="choseSku(2)">
+								<view class="addCar" @click="choseSku(2)" v-if="stockValue=='有货'">
 									加入购物车
 								</view>
-								<view class="buyNow" @click="choseSku(3)">
+								<view class="buyNow" @click="choseSku(3)" v-if="stockValue=='有货'">
 									立即购买
 								</view>
+								<view class="btn-bg" v-if="stockValue=='无货'">
+									无货
+								</view>
 							</template>
 						</template>
 						<template v-if="isPre">
@@ -484,11 +490,11 @@
 					name: '运损换新'
 				}],
 				selectSku: '',
-				selectShop: 1,
+				selectNum: 1,
 				multiIndex: [0, 0, 0],
 				multiArray: [],
 				multiData: [],
-				stockValue: '南京市',
+				stockValue: '有货',
 				addressResult: {
 					province: '江苏省',
 					city: '南京市',
@@ -552,7 +558,7 @@
 		methods: {
 			async getGoodsStockInfor() {
 				let params = {
-					goods_id: this.goodsId,
+					list:[{goods_id:this.goodsId,num:this.selectNum}],
 					province: this.addressResult ? this.addressResult.province : '江苏省',
 					city: this.addressResult ? this.addressResult.city : '南京市',
 					district: this.addressResult ? this.addressResult.district : '玄武区'
@@ -836,8 +842,9 @@
 				})
 			},
 			onGetSku(e) {
+				console.log(e)
 				this.selectSku = e.selectSku
-				this.selectShop = e.shopNum
+				this.selectNum = e.shopNum
 			},
 			// 更新购物车数量
 			onAddCart(total) {
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index cfd0b43..78d7685 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -1,18 +1,20 @@
-<template>
-	<view class="sureOrder">
+<template>
+	<view class="sureOrder">
 		<view>
-			<u-navbar title="确认订单" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
-		</view>
-		<view class="buyType">
-			<view class="toDoor" :class="buyType=='sm'?'':'toDoor-dis'"  @click="handleSwichDelivery(DeliveryTypeEnum.EXPRESS.value,'sm')">
-				送货上门
-			</view>
-			<view class="toDoor" :class="buyType=='zq'?'':'toDoor-dis'" @click="handleSwichDelivery(DeliveryTypeEnum.EXTRACT.value,'zq')">
-				到店自取
+			<u-navbar title="确认订单" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
+		</view>
+		<view class="buyType">
+			<view class="toDoor" :class="buyType=='sm'?'':'toDoor-dis'"
+				@click="handleSwichDelivery(DeliveryTypeEnum.EXPRESS.value,'sm')">
+				送货上门
+			</view>
+			<view class="toDoor" :class="buyType=='zq'?'':'toDoor-dis'"
+				@click="handleSwichDelivery(DeliveryTypeEnum.EXTRACT.value,'zq')">
+				到店自取
 			</view>
-			<view class="toDoor-on" :style="{'left': buyType=='sm'?'0':'350rpx'}">{{buyType=='zq'?'到店自取':'送货上门'}}</view>
-		</view>
-		<view class="getSelf" >
+			<view class="toDoor-on" :style="{'left': buyType=='sm'?'0':'350rpx'}">{{buyType=='zq'?'到店自取':'送货上门'}}</view>
+		</view>
+		<view class="getSelf">
 			<view class="address" v-if="buyType=='sm'" @click="onSelectAddress">
 				<view class="addAddress">
 					<view class="tip" v-if="!order.address">请点击添加收货地址</view>
@@ -22,7 +24,7 @@
 							<text v-for="(region, idx) in order.address.region" :key="idx">{{ region }}</text>
 							<text>{{ order.address.detail }}</text>
 						</view>
-					</view>
+					</view>
 				</view>
 				<view class="leftImg">
 					<image :src="$picUrl+'/static/order/left.png'"></image>
@@ -40,7 +42,9 @@
 						</view>
 					</view>
 					<view class="b">
-						{{ order.extractShop.region.province }} {{ order.extractShop.region.city }}{{ order.extractShop.region.region }} {{ order.extractShop.address }}
+						{{ order.extractShop.region.province }}
+						{{ order.extractShop.region.city }}{{ order.extractShop.region.region }}
+						{{ order.extractShop.address }}
 					</view>
 					<view class="lookMap">
 						<image :src="$picUrl+'/static/user/address.png'" mode="" class="addressIcon"></image>
@@ -53,7 +57,9 @@
 						<image :src="$picUrl+'/static/order/left.png'" mode="" class="rightIcon"></image>
 					</view>
 				</view>
-				<view class="tip" v-else @click="onSelectExtractPoint()">请选择门店<image :src="$picUrl+'/static/order/left.png'" mode=""></image></view>
+				<view class="tip" v-else @click="onSelectExtractPoint()">请选择门店<image
+						:src="$picUrl+'/static/order/left.png'" mode=""></image>
+				</view>
 				<view class="pickUp">
 					<view class="pickPeople">
 						<view class="title">
@@ -75,823 +81,906 @@
 					</view>
 				</view>
 			</view>
-	
-		</view>
-		<view class="preTime" v-if="buyType=='zq'">
-			<view class="left">
-				<view class="bagImg">
-					<image :src="$picUrl+'/static/order/bag.png'" mode="" class="bag"></image>
-					街边取
-				</view>
-				<view class="preText">
-					如果您不方便，只需要在街边稍候，送到您的手上
-				</view>
-			</view>
-			<view class="switch">
-				<u-switch v-model="is_street_take"></u-switch>
-			</view>
-		</view>
-		<view class="timer" v-if="buyType=='zq'">
-			<view class="youTime">
-				预计到店时间
-			</view>
-			<view class="leftImg" @click="openPicker(1)">
-				<text v-if="timer" class="leftText">{{timer}}</text>
-				<text v-else>请选择</text>
-				<image :src="$picUrl+'/static/order/left.png'" mode=""></image>
-			</view>
-		</view>
-		<view class="timer" v-if="buyType=='sm'">
-			<view class="youTime">
-				您期待的收货时间
-			</view>
+
+		</view>
+		<view class="preTime" v-if="buyType=='zq'">
+			<view class="left">
+				<view class="bagImg">
+					<image :src="$picUrl+'/static/order/bag.png'" mode="" class="bag"></image>
+					街边取
+				</view>
+				<view class="preText">
+					如果您不方便，只需要在街边稍候，送到您的手上
+				</view>
+			</view>
+			<view class="switch">
+				<u-switch v-model="is_street_take"></u-switch>
+			</view>
+		</view>
+		<view class="timer" v-if="buyType=='zq'">
+			<view class="youTime">
+				预计到店时间
+			</view>
+			<view class="leftImg" @click="openPicker(1)">
+				<text v-if="timer" class="leftText">{{timer}}</text>
+				<text v-else>请选择</text>
+				<image :src="$picUrl+'/static/order/left.png'" mode=""></image>
+			</view>
+		</view>
+		<view class="timer" v-if="buyType=='sm'">
+			<view class="youTime">
+				您期待的收货时间
+			</view>
 			<view class="leftImg" @click="openPicker(2)">
 				<text v-if="timer" class="leftText">{{timer}}</text>
 				<text v-else>请选择</text>
-				<image :src="$picUrl+'/static/order/left.png'" mode=""></image>
-			</view>
-		</view>
-		<view class="goodsDetail">
-			<view class="goodsType" @click="toStore()">
-				<image :src="$picUrl+'/static/order/bag.png'" mode="" class="bag"></image>
-				<text>{{cityInfo.shop_name}}</text>
-				<image :src="$picUrl+'/static/order/left.png'" mode="" class="leftIcon"></image>
-			</view>
-			<view class="goods" v-for="(item, index) in order.goodsList" :key="index">
-				<view class="goodsImg">
-					<image :src="item.goods_image" mode=""></image>
-				</view>
-				<view class="goodsInfo">
-					<view class="goodsName">
-						{{ item.goods_name }}
+				<image :src="$picUrl+'/static/order/left.png'" mode=""></image>
+			</view>
+		</view>
+		<view class="goodsDetail">
+			<view class="goodsType" @click="toStore()">
+				<image :src="$picUrl+'/static/order/bag.png'" mode="" class="bag"></image>
+				<text>{{cityInfo.shop_name}}</text>
+				<image :src="$picUrl+'/static/order/left.png'" mode="" class="leftIcon"></image>
+			</view>
+			<view class="goods" v-for="(item, index) in order.goodsList" :key="index">
+				<view class="goodsImg">
+					<image :src="item.goods_image" mode=""></image>
+				</view>
+				<view class="goodsInfo">
+					<view class="goodsName">
+						{{ item.goods_name }}
 					</view>
 					<!-- 商品规格 -->
 					<view class="goods-props">
-					  <view class="goods-props-item" v-for="(props, idx) in item.skuInfo.goods_props" :key="idx">
-					    <text class="group-name">{{ props.group.name }}: </text>
-					    <text>{{ props.value.name }}；</text>
-					  </view>
-					</view>
-					<view class="goodsPrice">
-						￥ <text>{{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}</text>
-					</view>
-				</view>
-				<view class="goodsNum">
-					x{{ item.total_num }}
-				</view>
-			</view>
-		</view>
-		<view class="timer">
-			<view class="youTime" style="width: 60rpx;">
-				留言
-			</view>
-			<input type="textarea" placeholder="建议留言前先和店家沟通" v-model="remark" style="width:100%;" maxlength="100" />
-		</view>
-		<view class="orderTips">
-			<view class="orderTitle">
-				<view class="total">
-					商品总额
-				</view>
-				<view class="price">
-					￥{{ order.orderTotalPrice?Number(order.orderTotalPrice):order.orderTotalPrice }}
-				</view>
-			</view>
-			<view class="orderTitle" v-if="order.address">
-				<view class="total">
-					运费
-				</view>
-				<view class="price" v-if="order.isIntraRegion">
-					￥{{ order.expressPrice?Number(order.expressPrice):order.expressPrice }}
+						<view class="goods-props-item" v-for="(props, idx) in item.skuInfo.goods_props" :key="idx">
+							<text class="group-name">{{ props.group.name }}: </text>
+							<text>{{ props.value.name }}；</text>
+						</view>
+					</view>
+					<view class="goodsPrice">
+						￥ <text>{{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}</text>
+					</view>
+				</view>
+				<view class="goodsNum">
+					x{{ item.total_num }}
+				</view>
+			</view>
+		</view>
+		<view class="timer">
+			<view class="youTime" style="width: 60rpx;">
+				留言
+			</view>
+			<input type="textarea" placeholder="建议留言前先和店家沟通" v-model="remark" style="width:100%;" maxlength="100" />
+		</view>
+		<view class="orderTips">
+			<view class="orderTitle">
+				<view class="total">
+					商品总额
+				</view>
+				<view class="price">
+					￥{{ order.orderTotalPrice?Number(order.orderTotalPrice):order.orderTotalPrice }}
+				</view>
+			</view>
+			<view class="orderTitle" v-if="order.address">
+				<view class="total">
+					运费
+				</view>
+				<view class="price" v-if="order.isIntraRegion">
+					￥{{ order.expressPrice?Number(order.expressPrice):order.expressPrice }}
 				</view>
 				<view class="price" v-else>
 					不在配送范围
-				</view>
-			</view>
-			<view class="orderTitle">
-				<view class="total">
-					商品数量
-				</view>
-				<view class="price">
-					<text class="couponNum">{{order.orderTotalNum}}件</text>
-				</view>
-			</view>
-			<view class="orderTitle">
-				<view class="total">
-					优惠券
-				</view>
-				<view class="price" v-if="order.couponList.length > 0" @click="handleShowPopup">
-					<text class="couponNum" v-if="order.couponId > 0">-￥{{ order.couponMoney }}</text>
-					<text class="couponNum" v-else>{{order.couponList.length}}张可用</text>
-					<image :src="$picUrl+'/static/order/left.png'"></image>
+				</view>
+			</view>
+			<view class="orderTitle">
+				<view class="total">
+					商品数量
+				</view>
+				<view class="price">
+					<text class="couponNum">{{order.orderTotalNum}}件</text>
+				</view>
+			</view>
+			<view class="orderTitle">
+				<view class="total">
+					优惠券
+				</view>
+				<view class="price" v-if="order.couponList.length > 0" @click="handleShowPopup">
+					<text class="couponNum" v-if="order.couponId > 0">-￥{{ order.couponMoney }}</text>
+					<text class="couponNum" v-else>{{order.couponList.length}}张可用</text>
+					<image :src="$picUrl+'/static/order/left.png'"></image>
 				</view>
 				<view class="price" v-else @click="handleNotUseCoupon">
 					<text class="couponNum">无优惠券可用</text>
 					<image :src="$picUrl+'/static/order/left.png'"></image>
-				</view>
-			</view>
-			<view class="line">
-
-			</view>
-			<view class="amount">
-				<view class="left">
-
-				</view>
-				<view class="right">
-					<text class="totalNum">共{{order.orderTotalNum}}件，合计：</text>
-					<text class="allPrice">￥{{ order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice }}</text>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="payType">
-			<view class="itemType">
-				<view class="payName">
-					<image src="/static/order/wChat.png" mode="" class="payIcon"></image>
-					微信支付
-				</view>
-				<image src="/static/order/right.png" mode="" class="chose"></image>
-			</view>
-			<view class="line">
-
-			</view>
-			<view class="itemType">
-				<view class="" v-for="(item,index) in payMethList" :key="index" @click="chosePayType(item)">
-					<view class="payName">
-						<image src="/static/order/friends.png" mode="" class="payIcon"></image>
-						余额支付
-					</view>
-					<image src="/static/order/right.png" mode="" class="chose" v-if="payType==item.method"></image>
-				</view>
-			</view>
-			<view class="line">
-
-			</view> -->
-			<!-- <view class="itemType">
-				<view class="payName">
-					<image src="/static/order/shop.png" mode="" class="payIcon"></image>
-					到店支付
-				</view>
-				
-			</view> -->
-		<!-- </view> -->
-		<view class="footer">
-			<view class="meetPrice">
-				应付款
-				<text class="type">￥</text>
-				<text class="price">{{order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice}}</text>
-			</view>
-			<view class="btn" @click="onSubmitOrder()">
-				提交订单
-			</view>
+				</view>
+			</view>
+			<view class="line">
+
+			</view>
+			<view class="amount">
+				<view class="left">
+
+				</view>
+				<view class="right">
+					<text class="totalNum">共{{order.orderTotalNum}}件，合计：</text>
+					<text
+						class="allPrice">￥{{ order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice }}</text>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="payType">
+			<view class="itemType">
+				<view class="payName">
+					<image src="/static/order/wChat.png" mode="" class="payIcon"></image>
+					微信支付
+				</view>
+				<image src="/static/order/right.png" mode="" class="chose"></image>
+			</view>
+			<view class="line">
+
+			</view>
+			<view class="itemType">
+				<view class="" v-for="(item,index) in payMethList" :key="index" @click="chosePayType(item)">
+					<view class="payName">
+						<image src="/static/order/friends.png" mode="" class="payIcon"></image>
+						余额支付
+					</view>
+					<image src="/static/order/right.png" mode="" class="chose" v-if="payType==item.method"></image>
+				</view>
+			</view>
+			<view class="line">
+
+			</view> -->
+		<!-- <view class="itemType">
+				<view class="payName">
+					<image src="/static/order/shop.png" mode="" class="payIcon"></image>
+					到店支付
+				</view>
+				
+			</view> -->
+		<!-- </view> -->
+		<view class="footer">
+			<view class="meetPrice">
+				应付款
+				<text class="type">￥</text>
+				<text class="price">{{order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice}}</text>
+			</view>
+			<view class="btn" @click="onSubmitOrder()" v-if="stockValue=='有货'">
+				提交订单
+			</view>
+			<view class="btn" style="background: #cecece;" v-else>
+				无货
+			</view>
 		</view>
 		<!-- 优惠券弹出框 -->
 		<u-popup v-model="showPopup" mode="bottom">
-		  <view class="popup__coupon">
-		    <view class="coupon__title f-30">选择优惠券</view>
-		    <!-- 优惠券列表 -->
-		    <view class="coupon-list">
-		      <scroll-view :scroll-y="true" style="height: 565rpx;">
-		        <view class="coupon-item" v-for="(item, index) in order.couponList" :key="index">
-		          <view class="item-wrapper" :class="[item.is_apply ? 'color-' + CouponColors[index % CouponColors.length] : 'color-gray']"
-		            @click="handleSelectCoupon(index)">
-		            <view class="coupon-type">{{ CouponTypeEnum[item.coupon_type].name }}</view>
-		            <view class="tip dis-flex flex-dir-column flex-x-center">
-		              <view v-if="item.coupon_type == CouponTypeEnum.FULL_DISCOUNT.value">
-		                <text class="f-30">￥</text>
-		                <text class="money">{{ item.reduce_price }}</text>
-		              </view>
-		              <text class="money" v-if="item.coupon_type == CouponTypeEnum.DISCOUNT.value">{{ item.discount }}折</text>
-		              <text class="pay-line">满{{ item.min_price }}元可用</text>
-		            </view>
-		            <view class="split-line"></view>
-		            <view class="content dis-flex flex-dir-column flex-x-between">
-		              <view class="title">{{ item.name }}</view>
-		              <view class="bottom dis-flex flex-y-center">
-		                <view class="time flex-box">
-		                  <block v-if="item.start_time === item.end_time">{{ item.start_time }} 当天有效</block>
-		                  <block v-else>{{ item.start_time }}~{{ item.end_time }}</block>
-		                </view>
-		              </view>
-		            </view>
-		          </view>
-		        </view>
-		      </scroll-view>
-		    </view>
-		    <!-- 不使用优惠券 -->
-		    <view class="coupon__do_not dis-flex flex-y-center flex-x-center">
-		      <view class="control dis-flex flex-y-center flex-x-center" @click="handleNotUseCoupon()">
-		        <text class="f-26">不使用优惠券</text>
-		      </view>
-		    </view>
-		  </view>
-		</u-popup>
+			<view class="popup__coupon">
+				<view class="coupon__title f-30">选择优惠券</view>
+				<!-- 优惠券列表 -->
+				<view class="coupon-list">
+					<scroll-view :scroll-y="true" style="height: 565rpx;">
+						<view class="coupon-item" v-for="(item, index) in order.couponList" :key="index">
+							<view class="item-wrapper"
+								:class="[item.is_apply ? 'color-' + CouponColors[index % CouponColors.length] : 'color-gray']"
+								@click="handleSelectCoupon(index)">
+								<view class="coupon-type">{{ CouponTypeEnum[item.coupon_type].name }}</view>
+								<view class="tip dis-flex flex-dir-column flex-x-center">
+									<view v-if="item.coupon_type == CouponTypeEnum.FULL_DISCOUNT.value">
+										<text class="f-30">￥</text>
+										<text class="money">{{ item.reduce_price }}</text>
+									</view>
+									<text class="money"
+										v-if="item.coupon_type == CouponTypeEnum.DISCOUNT.value">{{ item.discount }}折</text>
+									<text class="pay-line">满{{ item.min_price }}元可用</text>
+								</view>
+								<view class="split-line"></view>
+								<view class="content dis-flex flex-dir-column flex-x-between">
+									<view class="title">{{ item.name }}</view>
+									<view class="bottom dis-flex flex-y-center">
+										<view class="time flex-box">
+											<block v-if="item.start_time === item.end_time">{{ item.start_time }} 当天有效
+											</block>
+											<block v-else>{{ item.start_time }}~{{ item.end_time }}</block>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!-- 不使用优惠券 -->
+				<view class="coupon__do_not dis-flex flex-y-center flex-x-center">
+					<view class="control dis-flex flex-y-center flex-x-center" @click="handleNotUseCoupon()">
+						<text class="f-26">不使用优惠券</text>
+					</view>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
-		<u-picker mode="time" v-model="show1" :params="params" @confirm="confirm"></u-picker>
-	</view>
-</template>
-
-<script>
+		<u-picker mode="time" v-model="show1" :params="params" @confirm="confirm"></u-picker>
+	</view>
+</template>
+
+<script>
 	import * as Verify from '@/utils/verify'
 	import * as CheckoutApi from '@/api/checkout'
 	import * as SharpCheckoutApi from '@/api/sharp/checkout'
 	import * as BargainCheckoutApi from '@/api/bargain/checkout'
 	import * as GrouponCheckoutApi from '@/api/groupon/checkout'
-	import { CouponTypeEnum } from '@/common/enum/coupon'
-	import { OrderTypeEnum, DeliveryTypeEnum } from '@/common/enum/order'
-	
+	import * as GoodsApi from '@/api/goods'
+	import {
+		CouponTypeEnum
+	} from '@/common/enum/coupon'
+	import {
+		OrderTypeEnum,
+		DeliveryTypeEnum
+	} from '@/common/enum/order'
+
 	const CouponColors = ['red', 'blue', 'violet', 'yellow']
-	
+
 	// 根据指定mode获取对应的api类
 	const getCheckoutApi = (mode) => {
-	  const apiEnum = {
-	    buyNow: CheckoutApi,
-	    cart: CheckoutApi,
-	    bargain: BargainCheckoutApi,
-	    sharp: SharpCheckoutApi,
-	    groupon: GrouponCheckoutApi
-	  }
-	  return apiEnum[mode]
+		const apiEnum = {
+			buyNow: CheckoutApi,
+			cart: CheckoutApi,
+			bargain: BargainCheckoutApi,
+			sharp: SharpCheckoutApi,
+			groupon: GrouponCheckoutApi
+		}
+		return apiEnum[mode]
 	}
-	
+
 	// 根据指定mode获取param
 	const getModeParam = (mode, options) => {
-	  const param = {}
-	  // 结算模式: 立即购买
-	  if (mode === 'buyNow') {
-	    param.goodsId = options.goodsId
-	    param.goodsNum = options.goodsNum
-	    param.goodsSkuId = options.goodsSkuId
-	  }
-	  // 结算模式: 购物车
-	  if (mode === 'cart') {
-	    param.cartIds = options.cartIds
-	  }
-	  // 结算模式: 砍价活动
-	  if (mode === 'bargain') {
-	    param.taskId = options.taskId
-	    param.goodsSkuId = options.goodsSkuId
-	  }
-	  // 结算模式: 整点秒杀
-	  if (mode === 'sharp') {
-	    param.activeTimeId = options.activeTimeId
-	    param.sharpGoodsId = options.sharpGoodsId
-	    param.goodsSkuId = options.goodsSkuId
-	    param.goodsNum = options.goodsNum
-	  }
-	  // 结算模式: 多人拼团
-	  if (mode === 'groupon') {
-	    param.grouponGoodsId = options.grouponGoodsId
-	    param.taskId = options.taskId
-	    param.goodsSkuId = options.goodsSkuId
-	    param.goodsNum = options.goodsNum
-	    param.stepPeople = options.stepPeople
-	  }
-	  return param
+		const param = {}
+		// 结算模式: 立即购买
+		if (mode === 'buyNow') {
+			param.goodsId = options.goodsId
+			param.goodsNum = options.goodsNum
+			param.goodsSkuId = options.goodsSkuId
+		}
+		// 结算模式: 购物车
+		if (mode === 'cart') {
+			param.cartIds = options.cartIds
+		}
+		// 结算模式: 砍价活动
+		if (mode === 'bargain') {
+			param.taskId = options.taskId
+			param.goodsSkuId = options.goodsSkuId
+		}
+		// 结算模式: 整点秒杀
+		if (mode === 'sharp') {
+			param.activeTimeId = options.activeTimeId
+			param.sharpGoodsId = options.sharpGoodsId
+			param.goodsSkuId = options.goodsSkuId
+			param.goodsNum = options.goodsNum
+		}
+		// 结算模式: 多人拼团
+		if (mode === 'groupon') {
+			param.grouponGoodsId = options.grouponGoodsId
+			param.taskId = options.taskId
+			param.goodsSkuId = options.goodsSkuId
+			param.goodsNum = options.goodsNum
+			param.stepPeople = options.stepPeople
+		}
+		return param
 	}
-	
+
 	export default {
-	  data() {
-	    return {
-			is_street_take: false,
-			expect_receive_time: "",
-			to_store_time: "",
-			 cityInfo: {},
-			params: {
-				year: true,
-				month: true,
-				day: true,
-				hour: true,
-				minute: true,
-				second: true
-			},
-			show1: false,
-			background: {
-				background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat',
-				backgroundSize: '100% auto',
-			},
-	      // 枚举类
-	      OrderTypeEnum,
-	      DeliveryTypeEnum,
-	      CouponTypeEnum,
-	      // 当前页面参数
-	      options: {},
-	      // 配送方式
-	      isShowTab: false,
-	      DeliveryTypeEnum,
-	      curDelivery: null,
-	      // 自提信息
-	      selectedShopId: 0, // 选择的门店ID
-	      linkman: '', // 自提联系人
-	      phone: '', // 自提联系电话
-	      // 优惠券颜色组
-	      CouponColors,
-	      // 选择的优惠券
-	      selectCouponId: 0,
-	      // 是否使用积分抵扣
-	      isUsePoints: false,
-	      // 买家留言
-	      remark: '',
-	      // 禁用submit按钮
-	      disabled: false,
-	      // 是否显示积分说明
-	      showPoints: false,
-	      // 是否显示优惠券弹窗
-	      showPopup: false,
-	      // 订单信息 (从后端api中获取)
-	      order: {
-	        // 商品列表
-	        goodsList: [],
-	        // 优惠券列表
-	        couponList: [],
-	        // 是否存在收货地址
-	        existAddress: false,
-	        // 默认收货地址
-	        address: null,
-	        // 是否存在收货地址
-	        existAddress: false,
-	        // 当前用户收货城市是否存在配送规则中
-	        isIntraRegion: true,
-	        // 是否存在错误
-	        hasError: false,
-	        // 错误信息
-	        errorMsg: '',
-	      },
-	      // 个人信息
-	      personal: {},
-		  buyType:'sm',
-	      // 商城设置
-	      setting: {},
-		  timer: "",
-		  distance_unit: ""
-	    }
-	  },
-	
-	  /**
-	   * 生命周期函数--监听页面加载
-	   */
-	  onLoad(options) {
-	    this.options = options;
-		this.cityInfo = uni.getStorageSync("cityInfo")
-		console.log(options)
-	    // 注册全局事件订阅: 选择自提门店
-	    uni.$on('syncSelectedId', selectedId => {
-	      this.selectedShopId = selectedId
-	    })
-		// 注册全局事件订阅: 选择自提门店
-		uni.$on('syncSelectedDistance_unit', distance_unit => {
-		  this.distance_unit = distance_unit
-		})
-	  },
-	
-	  /**
-	   * 生命周期函数--监听页面的卸载
-	   */
-	  onUnload() {
-	    // 卸载全局事件订阅: 选择自提门店
-	    uni.$off('syncSelectedId')
-	  },
-	
-	  /**
-	   * 生命周期函数--监听页面显示
-	   */
-	  onShow() {
-	    // 获取当前订单信息
-	    this.getOrderData()
-	  },
-	
-	  methods: {
-		  toStore() {
-			  uni.navigateTo({
-			  	url: "/pages/news/consult/about"
-			  })
-		  },
-		openMap(info) {
-		  uni.openLocation({
-			latitude: Number(info.latitude),
-			longitude: Number(info.longitude),
-			complete: function (res) {
-				console.log('success',res);
+		data() {
+			return {
+				is_street_take: false,
+				expect_receive_time: "",
+				to_store_time: "",
+				cityInfo: {},
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
+				},
+				show1: false,
+				background: {
+					background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat',
+					backgroundSize: '100% auto',
+				},
+				// 枚举类
+				OrderTypeEnum,
+				DeliveryTypeEnum,
+				CouponTypeEnum,
+				// 当前页面参数
+				options: {},
+				// 配送方式
+				isShowTab: false,
+				DeliveryTypeEnum,
+				curDelivery: null,
+				// 自提信息
+				selectedShopId: 0, // 选择的门店ID
+				linkman: '', // 自提联系人
+				phone: '', // 自提联系电话
+				// 优惠券颜色组
+				CouponColors,
+				// 选择的优惠券
+				selectCouponId: 0,
+				// 是否使用积分抵扣
+				isUsePoints: false,
+				// 买家留言
+				remark: '',
+				// 禁用submit按钮
+				disabled: false,
+				// 是否显示积分说明
+				showPoints: false,
+				// 是否显示优惠券弹窗
+				showPopup: false,
+				// 订单信息 (从后端api中获取)
+				order: {
+					// 商品列表
+					goodsList: [],
+					// 优惠券列表
+					couponList: [],
+					// 是否存在收货地址
+					existAddress: false,
+					// 默认收货地址
+					address: null,
+					// 是否存在收货地址
+					existAddress: false,
+					// 当前用户收货城市是否存在配送规则中
+					isIntraRegion: true,
+					// 是否存在错误
+					hasError: false,
+					// 错误信息
+					errorMsg: '',
+				},
+				// 个人信息
+				personal: {},
+				buyType: 'sm',
+				// 商城设置
+				setting: {},
+				timer: "",
+				distance_unit: "",
+				stockValue: '无货',
+				addressResult: {
+					province: '江苏省',
+					city: '南京市',
+					district: '玄武区'
+				}
 			}
-		  });
 		},
-		openPicker() {
-			this.show1 = true;
+
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+			this.options = options;
+			this.cityInfo = uni.getStorageSync("cityInfo")
+			console.log(options)
+			// 注册全局事件订阅: 选择自提门店
+			uni.$on('syncSelectedId', selectedId => {
+				this.selectedShopId = selectedId
+			})
+			// 注册全局事件订阅: 选择自提门店
+			uni.$on('syncSelectedDistance_unit', distance_unit => {
+				this.distance_unit = distance_unit
+			})
+		},
+
+		/**
+		 * 生命周期函数--监听页面的卸载
+		 */
+		onUnload() {
+			// 卸载全局事件订阅: 选择自提门店
+			uni.$off('syncSelectedId')
 		},
-		confirm(e){
-			this.timer = e.year+'-'+e.month+'-'+e.day+' '+e.hour+':'+e.minute+':'+e.second
+
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow() {
+			// 获取当前订单信息
+			this.getOrderData()
 		},
-	    // 获取订单数据
-	    getOrderData() {
-	      const app = this
-	      const { options: { mode } } = app
-	      // 请求的参数
-	      const params = app.getRequestParam()
-	      // 请求api
-	      getCheckoutApi(mode)
-	        .order(mode, params)
-	        .then(result => app.initData(result.data))
-	        .catch(err => err)
-	    },
-	
-	    // 初始化数据
-	    initData({ order, setting, personal }) {
-	      const app = this
-	      app.order = order
-	      app.personal = personal
-	      app.setting = setting
-	      // 显示错误信息
-	      if (order.hasError) {
-	        app.showToast(order.errorMsg, 3000)
-	      }
-	      // 当前选择的配送方式
-	      app.curDelivery = order.delivery
-	      // 如果只有一种配送方式则不显示选项卡
-	      app.isShowTab = setting.deliveryType.length > 1
-	      // 上门自提联系信息
-	      if (app.linkman === '') {
-	        app.linkman = order.lastExtract.linkman
-	      }
-	      if (app.phone === '') {
-	        app.phone = order.lastExtract.phone
-	      }
-	    },
-	
-	    // 获取api请求的参数
-	    getRequestParam() {
-	      const app = this
-	      const { options } = app
-	      // 结算模式的固定参数
-	      const modeParam = getModeParam(options.mode, options)
-	      // 订单结算参数(用户选择)
-	      const orderParam = {
-	        delivery: app.curDelivery || 0,
-	        shopId: app.selectedShopId || 0,
-	        couponId: app.selectCouponId || 0,
-	        isUsePoints: app.isUsePoints ? 1 : 0,
-	      }
-	      return { ...orderParam, ...modeParam }
-	    },
-	
-	    // 切换配送方式
-	    handleSwichDelivery(key,val) {
-	      this.curDelivery = key
-	      this.getOrderData();
-		  this.timer = ""
-		  this.is_street_take = false
-		  this.buyType = val;
-	    },
-	
-	    // 显示积分说明
-	    handleShowPoints() {
-	      this.showPoints = true
-	    },
-	
-	    // 显示优惠券弹窗
-	    handleShowPopup() {
-	      this.showPopup = true
-	    },
-	
-	    // 选择优惠券
-	    handleSelectCoupon(index) {
-	      const app = this
-	      const { couponList } = app.order
-	      // 当前选择的优惠券
-	      const couponItem = couponList[index]
-	      // 判断是否在适用范围
-	      if (!couponItem.is_apply) {
-	        app.showToast(couponItem.not_apply_info)
-	        return
-	      }
-	      // 记录选中的优惠券id
-	      app.selectCouponId = couponItem.user_coupon_id
-	      // 重新获取订单信息
-	      app.getOrderData()
-	      // 隐藏优惠券弹层
-	      app.showPopup = false
-	    },
-	
-	    // 不使用优惠券
-	    handleNotUseCoupon() {
-	      const app = this
-	      app.selectCouponId = 0
-	      // 重新获取订单信息
-	      app.getOrderData()
-	      // 隐藏优惠券弹层
-	      app.showPopup = false
-	    },
-	
-	    // 快递配送：选择收货地址
-	    onSelectAddress() {
-	      this.$navTo('pages/address/index', { from: 'checkout' })
-	    },
-	
-	    // 上门自提：选择自提点
-	    onSelectExtractPoint() {
-	      this.$navTo('pages/shop/extract', { selectedId: this.selectedShopId })
-	    },
-	
-	    // 跳转到商品详情页
-	    onTargetGoods(goodsId) {
-	      this.$navTo('pages/goods/detail', { goodsId })
-	    },
-	
-	    // 订单提交
-	    onSubmitOrder() {
-	      const app = this
-	      if (app.disabled) {
-	        return false
-	      }
-	      // 表单验证
-	      if (!app.onVerifyFrom()) {
-	        return false
-	      }
-	      // 按钮禁用
-	      app.disabled = true
-	      // 请求api
-	      getCheckoutApi(app.options.mode)
-	        .submit(app.options.mode, app.getFormData())
-	        .then(result => {
-	          // 订单创建成功: 跳转到订单支付页
-	          const orderId = result.data.orderId
-	          setTimeout(() => {
-	            this.$navTo('pages/checkout/cashier/index', { orderId }, 'redirectTo')
-	          }, 100)
-	        })
-	        .catch(res => app.showToast(res.errMsg, 3000))
-	        .finally(() => setTimeout(() => app.disabled = false, 800))
-	    },
-	
-	    // 跳转到我的订单(等待1秒)
-	    navToMyOrder() {
-	      setTimeout(() => {
-	        this.$navTo('pages/order/index', {}, 'redirectTo')
-	      }, 1000)
-	    },
-	    // 表单提交的数据
-	    getFormData() {
-	      const app = this
-	      const { options } = app
-	      // 表单数据
-	      const form = {
-	        delivery: app.curDelivery,
-	        couponId: app.selectCouponId || 0,
-	        shopId: app.selectedShopId || 0,
-	        linkman: app.linkman,
-	        phone: app.phone,
-	        isUsePoints: app.isUsePoints ? 1 : 0,
-	        remark: app.remark || '',
-	        expect_receive_time: app.buyType == 'sm'?app.timer : '',
-	        is_street_take: app.buyType == 'zq'?(app.is_street_take?1:0) : '',
-	        to_store_time: app.buyType == 'zq'?app.timer : '',
-			ziti_address:app.buyType=='zq'?({
-				shopId: app.selectedShopId || 0,
-				linkman: app.linkman,
-				phone: app.phone,
-			}):''
-	      }
-	      // 获取不同模式的参数
-	      const modeParam = getModeParam(options.mode, options)
-	      return { ...form, ...modeParam }
-	    },
-	
-	    // 表单验证
-	    onVerifyFrom() {
-	      const app = this
-	      if (app.hasError) {
-	        app.showToast(app.errorMsg, 3000)
-	        return false
-	      }
-	      // 验证自提填写的联系方式
-	      if (app.curDelivery == DeliveryTypeEnum.EXTRACT.value) {
-	        app.linkman = app.linkman.trim()
-	        app.phone = app.phone.trim()
-	        if (app.selectedShopId <= 0) {
-	          app.showToast('请选择自提的门店')
-	          return false
-	        }
-	        if (Verify.isEmpty(app.linkman)) {
-	          app.showToast('请填写自提联系人')
-	          return false
-	        }
-	        if (Verify.isEmpty(app.phone)) {
-	          app.showToast('请填写自提联系电话')
-	          return false
-	        }
-	        if (!Verify.isPhone(app.phone)) {
-	          app.showToast('请输入正确的联系电话')
-	          return false
-	        }
-	      }
-	      return true
-	    },
-	
-	    // 显示toast信息
-	    showToast(title, duration = 2000) {
-	      this.$refs.uToast.show({ title, duration })
-	    }
-	
-	  }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.sureOrder {
+
+		methods: {
+			async getGoodsStockInfor(order) {
+				console.log(order)
+				let that = this
+				let list = [];
+				order.goodsList.forEach(item => {
+					list.push({
+						goods_id: item.goods_id,
+						num: item.total_num
+					})
+				});
+				that.addressResult.province = order.address ? order.address.region.province : '江苏省'
+				that.addressResult.city = order.address ? order.address.region.city : '南京市'
+				that.addressResult.district = order.address ? order.address.region.region : '玄武区'
+				let params = {
+					list: list,
+					province: this.addressResult.province,
+					city: this.addressResult.city,
+					district: this.addressResult.district
+				}
+				console.log(params)
+				let {
+					status,
+					message,
+					data
+				} = await GoodsApi.getGoodsStock(params);
+				if (status == 200) {
+					this.stockValue = data.stock
+				}
+			},
+			toStore() {
+				uni.navigateTo({
+					url: "/pages/news/consult/about"
+				})
+			},
+			openMap(info) {
+				uni.openLocation({
+					latitude: Number(info.latitude),
+					longitude: Number(info.longitude),
+					complete: function(res) {
+						console.log('success', res);
+					}
+				});
+			},
+			openPicker() {
+				this.show1 = true;
+			},
+			confirm(e) {
+				this.timer = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second
+			},
+			// 获取订单数据
+			getOrderData() {
+				const app = this
+				const {
+					options: {
+						mode
+					}
+				} = app
+				// 请求的参数
+				const params = app.getRequestParam()
+				// 请求api
+				getCheckoutApi(mode)
+					.order(mode, params)
+					.then(result => app.initData(result.data))
+					.catch(err => err)
+			},
+
+			// 初始化数据
+			initData({
+				order,
+				setting,
+				personal
+			}) {
+				const app = this
+				app.order = order
+				app.personal = personal
+				app.setting = setting
+				// 显示错误信息
+				if (order.hasError) {
+					app.showToast(order.errorMsg, 3000)
+				}
+				// 当前选择的配送方式
+				app.curDelivery = order.delivery
+				// 如果只有一种配送方式则不显示选项卡
+				app.isShowTab = setting.deliveryType.length > 1
+				// 上门自提联系信息
+				if (app.linkman === '') {
+					app.linkman = order.lastExtract.linkman
+				}
+				if (app.phone === '') {
+					app.phone = order.lastExtract.phone
+				}
+				this.getGoodsStockInfor(app.order)
+			},
+
+			// 获取api请求的参数
+			getRequestParam() {
+				const app = this
+				const {
+					options
+				} = app
+				// 结算模式的固定参数
+				const modeParam = getModeParam(options.mode, options)
+				// 订单结算参数(用户选择)
+				const orderParam = {
+					delivery: app.curDelivery || 0,
+					shopId: app.selectedShopId || 0,
+					couponId: app.selectCouponId || 0,
+					isUsePoints: app.isUsePoints ? 1 : 0,
+				}
+				return {
+					...orderParam,
+					...modeParam
+				}
+			},
+
+			// 切换配送方式
+			handleSwichDelivery(key, val) {
+				this.curDelivery = key
+				this.getOrderData();
+				this.timer = ""
+				this.is_street_take = false
+				this.buyType = val;
+			},
+
+			// 显示积分说明
+			handleShowPoints() {
+				this.showPoints = true
+			},
+
+			// 显示优惠券弹窗
+			handleShowPopup() {
+				this.showPopup = true
+			},
+
+			// 选择优惠券
+			handleSelectCoupon(index) {
+				const app = this
+				const {
+					couponList
+				} = app.order
+				// 当前选择的优惠券
+				const couponItem = couponList[index]
+				// 判断是否在适用范围
+				if (!couponItem.is_apply) {
+					app.showToast(couponItem.not_apply_info)
+					return
+				}
+				// 记录选中的优惠券id
+				app.selectCouponId = couponItem.user_coupon_id
+				// 重新获取订单信息
+				app.getOrderData()
+				// 隐藏优惠券弹层
+				app.showPopup = false
+			},
+
+			// 不使用优惠券
+			handleNotUseCoupon() {
+				const app = this
+				app.selectCouponId = 0
+				// 重新获取订单信息
+				app.getOrderData()
+				// 隐藏优惠券弹层
+				app.showPopup = false
+			},
+
+			// 快递配送：选择收货地址
+			onSelectAddress() {
+				this.$navTo('pages/address/index', {
+					from: 'checkout'
+				})
+			},
+
+			// 上门自提：选择自提点
+			onSelectExtractPoint() {
+				this.$navTo('pages/shop/extract', {
+					selectedId: this.selectedShopId
+				})
+			},
+
+			// 跳转到商品详情页
+			onTargetGoods(goodsId) {
+				this.$navTo('pages/goods/detail', {
+					goodsId
+				})
+			},
+
+			// 订单提交
+			onSubmitOrder() {
+				const app = this
+				if (app.disabled) {
+					return false
+				}
+				// 表单验证
+				if (!app.onVerifyFrom()) {
+					return false
+				}
+				// 按钮禁用
+				app.disabled = true
+				// 请求api
+				getCheckoutApi(app.options.mode)
+					.submit(app.options.mode, app.getFormData())
+					.then(result => {
+						// 订单创建成功: 跳转到订单支付页
+						const orderId = result.data.orderId
+						setTimeout(() => {
+							this.$navTo('pages/checkout/cashier/index', {
+								orderId
+							}, 'redirectTo')
+						}, 100)
+					})
+					.catch(res => app.showToast(res.errMsg, 3000))
+					.finally(() => setTimeout(() => app.disabled = false, 800))
+			},
+
+			// 跳转到我的订单(等待1秒)
+			navToMyOrder() {
+				setTimeout(() => {
+					this.$navTo('pages/order/index', {}, 'redirectTo')
+				}, 1000)
+			},
+			// 表单提交的数据
+			getFormData() {
+				const app = this
+				const {
+					options
+				} = app
+				// 表单数据
+				const form = {
+					delivery: app.curDelivery,
+					couponId: app.selectCouponId || 0,
+					shopId: app.selectedShopId || 0,
+					linkman: app.linkman,
+					phone: app.phone,
+					isUsePoints: app.isUsePoints ? 1 : 0,
+					remark: app.remark || '',
+					expect_receive_time: app.buyType == 'sm' ? app.timer : '',
+					is_street_take: app.buyType == 'zq' ? (app.is_street_take ? 1 : 0) : '',
+					to_store_time: app.buyType == 'zq' ? app.timer : '',
+					ziti_address: app.buyType == 'zq' ? ({
+						shopId: app.selectedShopId || 0,
+						linkman: app.linkman,
+						phone: app.phone,
+					}) : ''
+				}
+				// 获取不同模式的参数
+				const modeParam = getModeParam(options.mode, options)
+				return {
+					...form,
+					...modeParam
+				}
+			},
+
+			// 表单验证
+			onVerifyFrom() {
+				const app = this
+				if (app.hasError) {
+					app.showToast(app.errorMsg, 3000)
+					return false
+				}
+				// 验证自提填写的联系方式
+				if (app.curDelivery == DeliveryTypeEnum.EXTRACT.value) {
+					app.linkman = app.linkman.trim()
+					app.phone = app.phone.trim()
+					if (app.selectedShopId <= 0) {
+						app.showToast('请选择自提的门店')
+						return false
+					}
+					if (Verify.isEmpty(app.linkman)) {
+						app.showToast('请填写自提联系人')
+						return false
+					}
+					if (Verify.isEmpty(app.phone)) {
+						app.showToast('请填写自提联系电话')
+						return false
+					}
+					if (!Verify.isPhone(app.phone)) {
+						app.showToast('请输入正确的联系电话')
+						return false
+					}
+				}
+				return true
+			},
+
+			// 显示toast信息
+			showToast(title, duration = 2000) {
+				this.$refs.uToast.show({
+					title,
+					duration
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.sureOrder {
 		width: 750rpx;
-		min-height: 750rpx;
-		padding-bottom: 140rpx;
-		background: url('https://www.royaum.com.cn/static/news/login-bg.png') center top no-repeat;
+		min-height: 750rpx;
+		padding-bottom: 140rpx;
+		background: url('https://www.royaum.com.cn/static/news/login-bg.png') center top no-repeat;
 		background-size: 100% auto;
+
 		/* 优惠券选择 */
 		.popup__coupon {
-		  background: #fff;
-		  box-sizing: border-box;
-		  padding: 30rpx;
-		  // 设置ios刘海屏底部横线安全区域
-		  padding-bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
-		  padding-bottom: calc(env(safe-area-inset-bottom) + 30rpx);
-		
-		  .coupon__do_not {
-			.control {
-			  width: 90%;
-			  height: 72rpx;
-			  color: #888;
-			  border: 1rpx solid #e3e3e3;
-			  border-radius: 10rpx;
-			}
-		  }
-		  
-		  .coupon__title {
-			text-align: center;
-			margin-bottom: 30rpx;
-		  }
-		  
-		  .coupon-list {
-			/* #ifdef H5 */
-			max-width: 1120rpx;
-			margin: 0 auto;
-			/* #endif */
-			margin-bottom: 24rpx;
-		  }
-		  
-		  .coupon-item {
-			position: relative;
-			overflow: hidden;
-			margin-bottom: 22rpx;
-		  }
-		  
-		  .item-wrapper {
-			width: 100%;
-			display: flex;
 			background: #fff;
-			border-radius: 8rpx;
-			color: #fff;
-			height: 180rpx;
-		  
-			.coupon-type {
-			  position: absolute;
-			  top: 0;
-			  right: 0;
-			  z-index: 10;
-			  width: 128rpx;
-			  padding: 6rpx 0;
-			  background: #a771ff;
-			  font-size: 20rpx;
-			  text-align: center;
-			  color: #ffffff;
-			  transform: rotate(45deg);
-			  transform-origin: 64rpx 64rpx;
-			}
-		  
-			&.color-blue {
-			  background: linear-gradient(-125deg, #57bdbf, #2f9de2);
-			}
-		  
-			&.color-red {
-			  background: linear-gradient(-128deg, #ff6d6d, #ff3636);
+			box-sizing: border-box;
+			padding: 30rpx;
+			// 设置ios刘海屏底部横线安全区域
+			padding-bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
+			padding-bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+
+			.coupon__do_not {
+				.control {
+					width: 90%;
+					height: 72rpx;
+					color: #888;
+					border: 1rpx solid #e3e3e3;
+					border-radius: 10rpx;
+				}
 			}
-		  
-			&.color-violet {
-			  background: linear-gradient(-113deg, #ef86ff, #b66ff5);
-		  
-			  .coupon-type {
-				background: #55b5ff;
-			  }
+
+			.coupon__title {
+				text-align: center;
+				margin-bottom: 30rpx;
 			}
-		  
-			&.color-yellow {
-			  background: linear-gradient(-141deg, #f7d059, #fdb054);
+
+			.coupon-list {
+				/* #ifdef H5 */
+				max-width: 1120rpx;
+				margin: 0 auto;
+				/* #endif */
+				margin-bottom: 24rpx;
 			}
-		  
-			&.color-gray {
-			  background: linear-gradient(-113deg, #bdbdbd, #a2a1a2);
-		  
-			  .coupon-type {
-				background: #9e9e9e;
-			  }
+
+			.coupon-item {
+				position: relative;
+				overflow: hidden;
+				margin-bottom: 22rpx;
 			}
-		  
-			.content {
-			  flex: 1;
-			  padding: 30rpx 20rpx;
-			  border-radius: 16rpx 0 0 16rpx;
-		  
-			  .title {
-				font-size: 32rpx;
-			  }
-		  
-			  .bottom {
-				.time {
-				  font-size: 24rpx;
+
+			.item-wrapper {
+				width: 100%;
+				display: flex;
+				background: #fff;
+				border-radius: 8rpx;
+				color: #fff;
+				height: 180rpx;
+
+				.coupon-type {
+					position: absolute;
+					top: 0;
+					right: 0;
+					z-index: 10;
+					width: 128rpx;
+					padding: 6rpx 0;
+					background: #a771ff;
+					font-size: 20rpx;
+					text-align: center;
+					color: #ffffff;
+					transform: rotate(45deg);
+					transform-origin: 64rpx 64rpx;
 				}
-		  
-				.receive {
-				  height: 46rpx;
-				  width: 122rpx;
-				  border: 1rpx solid #fff;
-				  border-radius: 30rpx;
-				  color: #fff;
-				  font-size: 24rpx;
-				  display: flex;
-				  justify-content: center;
-				  align-items: center;
-			  
-				  &.state {
-					border: none;
-				  }
+
+				&.color-blue {
+					background: linear-gradient(-125deg, #57bdbf, #2f9de2);
+				}
+
+				&.color-red {
+					background: linear-gradient(-128deg, #ff6d6d, #ff3636);
+				}
+
+				&.color-violet {
+					background: linear-gradient(-113deg, #ef86ff, #b66ff5);
+
+					.coupon-type {
+						background: #55b5ff;
+					}
+				}
+
+				&.color-yellow {
+					background: linear-gradient(-141deg, #f7d059, #fdb054);
+				}
+
+				&.color-gray {
+					background: linear-gradient(-113deg, #bdbdbd, #a2a1a2);
+
+					.coupon-type {
+						background: #9e9e9e;
+					}
+				}
+
+				.content {
+					flex: 1;
+					padding: 30rpx 20rpx;
+					border-radius: 16rpx 0 0 16rpx;
+
+					.title {
+						font-size: 32rpx;
+					}
+
+					.bottom {
+						.time {
+							font-size: 24rpx;
+						}
+
+						.receive {
+							height: 46rpx;
+							width: 122rpx;
+							border: 1rpx solid #fff;
+							border-radius: 30rpx;
+							color: #fff;
+							font-size: 24rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+
+							&.state {
+								border: none;
+							}
+						}
+					}
+				}
+
+				.tip {
+					position: relative;
+					flex: 0 0 32%;
+					text-align: center;
+					border-radius: 0 16rpx 16rpx 0;
+
+					.money {
+						font-weight: bold;
+						font-size: 52rpx;
+					}
+
+					.pay-line {
+						font-size: 22rpx;
+					}
+				}
+
+				.split-line {
+					position: relative;
+					flex: 0 0 0;
+					border-left: 4rpx solid #fff;
+					margin: 0 10rpx 0 6rpx;
+					background: #fff;
+
+					&:before,
+						{
+						border-radius: 0 0 16rpx 16rpx;
+						top: 0;
+					}
+
+					&:after {
+						border-radius: 16rpx 16rpx 0 0;
+						bottom: 0;
+					}
+
+					&:before,
+					&:after {
+						content: '';
+						position: absolute;
+						width: 24rpx;
+						height: 12rpx;
+						background: #f7f7f7;
+						left: -14rpx;
+						z-index: 1;
+					}
+
+
 				}
-			  }
-			}
-		  
-			.tip {
-			  position: relative;
-			  flex: 0 0 32%;
-			  text-align: center;
-			  border-radius: 0 16rpx 16rpx 0;
-		  
-			  .money {
-				font-weight: bold;
-				font-size: 52rpx;
-			  }
-		  
-			  .pay-line {
-				font-size: 22rpx;
-			  }
-			}
-		  
-			.split-line {
-			  position: relative;
-			  flex: 0 0 0;
-			  border-left: 4rpx solid #fff;
-			  margin: 0 10rpx 0 6rpx;
-			  background: #fff;
-		  
-			  &:before,
-				{
-				border-radius: 0 0 16rpx 16rpx;
-				top: 0;
-			  }
-		  
-			  &:after {
-				border-radius: 16rpx 16rpx 0 0;
-				bottom: 0;
-			  }
-		  
-			  &:before,
-			  &:after {
-				content: '';
-				position: absolute;
-				width: 24rpx;
-				height: 12rpx;
-				background: #f7f7f7;
-				left: -14rpx;
-				z-index: 1;
-			  }
-		  
-		  
 			}
-		  }
-		  
+
 		}
-		
-	}
-
+
+	}
+
 	.buyType {
-		width: 700rpx;
+		width: 700rpx;
 		margin: 30rpx auto 0;
 		position: relative;
-		height: 88rpx;
-		.toDoor {
-			width: 50%;
-			height: 74rpx;
-			background-color: rgba(255, 255, 255, 0.5);
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #606060;
-			line-height: 74rpx;
+		height: 88rpx;
+
+		.toDoor {
+			width: 50%;
+			height: 74rpx;
+			background-color: rgba(255, 255, 255, 0.5);
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #606060;
+			line-height: 74rpx;
 			text-align: center;
 			float: left;
 			margin-top: 14rpx;
 			float: left;
-			&-on{
+
+			&-on {
 				width: 350rpx;
 				height: 88rpx;
 				background-color: #FFF;
@@ -906,22 +995,24 @@
 				z-index: 2;
 				border-radius: 10rpx 10rpx 0 0;
 			}
-			&-dis{
+
+			&-dis {
 				border-radius: 10rpx 10rpx 0 0;
-			}
-		}
-	}
-
+			}
+		}
+	}
+
 	.getSelf {
-		width: 700rpx;
-		margin: 0 auto;
-		background-image: url('https://www.royaum.com.cn/static/order/map.png');
+		width: 700rpx;
+		margin: 0 auto;
+		background-image: url('https://www.royaum.com.cn/static/order/map.png');
 		background-size: 100%;
-		min-height: 160rpx;
-		padding: 14rpx 46rpx 0 32rpx;
-		box-sizing: border-box;
-		
-	}
+		min-height: 160rpx;
+		padding: 14rpx 46rpx 0 32rpx;
+		box-sizing: border-box;
+
+	}
+
 	.timer {
 		display: flex;
 		width: 700rpx;
@@ -933,12 +1024,14 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 0 32rpx 0 28rpx;
+
 		.youTime {
 			font-size: 25rpx;
 			font-weight: 400;
 			color: #000000;
 		}
-		input{
+
+		input {
 			flex: 1;
 			padding: 0 20rpx;
 			font-size: 25rpx;
@@ -946,64 +1039,76 @@
 			color: #000000;
 			text-align: right;
 		}
+
 		.leftImg {
 			font-size: 24rpx;
 			font-weight: 400;
 			color: #9E9E9E;
+
 			image {
 				width: 12rpx;
 				height: 18rpx;
 				margin-left: 16rpx;
 			}
 		}
-	}
-	.leftText {
-		font-size: 24rpx;
-		font-weight: 400;
-		color: #F21A1C;
-		line-height: 28rpx;
-	}
+	}
+
+	.leftText {
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #F21A1C;
+		line-height: 28rpx;
+	}
+
 	.shopAddress {
 		max-height: 260rpx;
 		padding-bottom: 20rpx;
 		overflow: hidden;
-		.tip{
+
+		.tip {
 			font-size: 24rpx;
 			color: #F32E2E;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			image{
+
+			image {
 				width: 12rpx;
 				height: 18rpx;
 			}
 		}
+
 		.pickUp {
 			display: flex;
 			justify-content: space-around;
 			margin-top: 16rpx;
+
 			.pickPeople {
 				flex: 1;
-				&:first-child{
+
+				&:first-child {
 					margin-right: 20rpx;
 				}
+
 				.title {
 					font-size: 24rpx;
 					font-weight: 400;
 					color: #838383;
 				}
-		
+
 				.name {
 					margin-top: 10rpx;
 					display: flex;
 					align-items: center;
-					input{
+
+					input {
 						width: 200rpx;
 						line-height: 60rpx;
 						font-size: 24rpx;
 						color: #2C2C2C;
 						display: block;
 					}
+
 					.edit {
 						width: 30rpx;
 						height: 30rpx;
@@ -1012,20 +1117,23 @@
 				}
 			}
 		}
-		.a{
+
+		.a {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
+
 			.youTime {
 				font-size: 28rpx;
 				font-weight: 600;
 				color: #1D1D1D;
 			}
-				
+
 			.leftImg {
 				font-size: 24rpx;
 				font-weight: 400;
 				color: #F42B17;
+
 				image {
 					width: 12rpx;
 					height: 18rpx;
@@ -1033,22 +1141,25 @@
 				}
 			}
 		}
-		.b{
+
+		.b {
 			font-size: 24rpx;
 			color: #838383;
 			line-height: 50rpx;
 		}
+
 		.lookMap {
 			display: flex;
 			align-items: center;
 			margin-top: 8rpx;
 			margin-bottom: 10rpx;
+
 			.addressIcon {
 				width: 23rpx;
 				height: 26rpx;
 				margin-right: 14rpx;
 			}
-		
+
 			.range {
 				font-size: 20rpx;
 				font-weight: 400;
@@ -1058,7 +1169,7 @@
 				border-right: 2rpx solid #D9D9D9;
 				margin-right: 10rpx;
 			}
-		
+
 			.checkMap {
 				font-size: 20rpx;
 				font-weight: 400;
@@ -1066,351 +1177,371 @@
 				line-height: 26rpx;
 				margin-right: 24rpx;
 			}
-		
+
 			.rightIcon {
 				width: 12rpx;
 				height: 18rpx;
 			}
 		}
-	}
-	.address {
-		width: 100%;
+	}
+
+	.address {
+		width: 100%;
 		display: flex;
-		height: 120rpx;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 22rpx 0 32rpx;
-		box-sizing: border-box;
-		.addAddress {
-			font-size: 28rpx;
-			font-weight: 500;
-			// color: #F32E2E;
+		height: 120rpx;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 22rpx 0 32rpx;
+		box-sizing: border-box;
+
+		.addAddress {
+			font-size: 28rpx;
+			font-weight: 500;
+			// color: #F32E2E;
 			color: #212121;
-			.info{
+
+			.info {
 				flex: 1;
-				.name{
+
+				.name {
 					font-size: 28rpx;
 					color: #212121;
-					text{
+
+					text {
 						margin-left: 20rpx;
 						color: #666;
 					}
 				}
-				.detail{
+
+				.detail {
 					margin-top: 10rpx;
 					font-size: 26rpx;
 				}
 			}
-			.tip{
+
+			.tip {
 				font-size: 30rpx;
 				font-weight: 500;
 				color: #F32E2E;
-			}
-		}
-
-		.leftImg {
-			width: 12rpx;
-			height: 18rpx;
-			image {
-				width: 100%;
+			}
+		}
+
+		.leftImg {
+			width: 12rpx;
+			height: 18rpx;
+
+			image {
+				width: 100%;
 				height: 100%;
-				display: block;
-			}
-		}
-	}
-	.ziqu{
+				display: block;
+			}
+		}
+	}
+
+	.ziqu {
 		overflow: hidden;
 		padding: 0 22rpx 0 32rpx;
-	}
-	.preTime {
-		width: 700rpx;
-		height: 140rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx;
-		margin: 12rpx 0 0 26rpx;
-		display: flex;
-		justify-content: space-between;
-		padding: 34rpx 0 0 30rpx;
-		box-sizing: border-box;
-		.left {
-			.bagImg {
-				font-size: 24rpx;
-				font-weight: 400;
+	}
+
+	.preTime {
+		width: 700rpx;
+		height: 140rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 12rpx 0 0 26rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 34rpx 0 0 30rpx;
+		box-sizing: border-box;
+
+		.left {
+			.bagImg {
+				font-size: 24rpx;
+				font-weight: 400;
 				color: #000000;
 				display: flex;
-				align-items: center;
-				.bag {
-					width: 35rpx;
+				align-items: center;
+
+				.bag {
+					width: 35rpx;
 					height: 35rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-		}
-
-		.preText {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #959595;
-			margin-top: 15rpx;
-		}
-	}
-
-	
-
-	.goodsDetail {
-		width: 700rpx;
-		min-height: 266rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 12rpx 0 0 26rpx;
-		padding: 32rpx 24rpx 24rpx 12rpx;
-
-		.goodsType {
-			display: flex;
-			align-items: center;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-
-			.bag {
-				width: 30rpx;
-				height: 30rpx;
-				margin-right: 20rpx;
-			}
-
-			.leftIcon {
-				width: 12rpx;
-				height: 18rpx;
-				margin-left: 20rpx;
-			}
-		}
-
-		.goods {
-			display: flex;
-			align-items: center;
-			margin-top: 28rpx;
-			justify-content: space-between;
-			.goodsImg {
-				width: 162rpx;
-				height: 148rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.goodsInfo {
-				margin-left: 20rpx;
-				max-width: 400rpx;
-				.goodsName {
-					min-height: 40rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #1E1E1E;
-					line-height: 40rpx;
-					margin-bottom: 4rpx;
-				}
-
-				.goodsPrice {
-					height: 50rpx;
-					font-size: 24rpx;
-					font-weight: 600;
-					color: #F21A1C;
-					line-height: 50rpx;
-					text {
-						font-size: 36rpx;
-					}
-				}
-			}
-			.goods-props{
+					margin-right: 10rpx;
+				}
+			}
+
+		}
+
+		.preText {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #959595;
+			margin-top: 15rpx;
+		}
+	}
+
+
+
+	.goodsDetail {
+		width: 700rpx;
+		min-height: 266rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		opacity: 1;
+		margin: 12rpx 0 0 26rpx;
+		padding: 32rpx 24rpx 24rpx 12rpx;
+
+		.goodsType {
+			display: flex;
+			align-items: center;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+
+			.bag {
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 20rpx;
+			}
+
+			.leftIcon {
+				width: 12rpx;
+				height: 18rpx;
+				margin-left: 20rpx;
+			}
+		}
+
+		.goods {
+			display: flex;
+			align-items: center;
+			margin-top: 28rpx;
+			justify-content: space-between;
+
+			.goodsImg {
+				width: 162rpx;
+				height: 148rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.goodsInfo {
+				margin-left: 20rpx;
+				max-width: 400rpx;
+
+				.goodsName {
+					min-height: 40rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #1E1E1E;
+					line-height: 40rpx;
+					margin-bottom: 4rpx;
+				}
+
+				.goodsPrice {
+					height: 50rpx;
+					font-size: 24rpx;
+					font-weight: 600;
+					color: #F21A1C;
+					line-height: 50rpx;
+
+					text {
+						font-size: 36rpx;
+					}
+				}
+			}
+
+			.goods-props {
 				font-size: 24rpx;
 				color: #999;
 				display: flex;
 				align-items: center;
-			}
-			.goodsNum {
-				font-size: 28rpx;
-				font-weight: 500;
+			}
+
+			.goodsNum {
+				font-size: 28rpx;
+				font-weight: 500;
 				color: #1E1E1E;
 				flex: 1;
-				text-align: right;
-			}
-		}
-	}
-
-	.orderTips {
-		width: 694rpx;
-		height: 342rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 12rpx 0 0 26rpx;
-		padding: 22rpx 36rpx 24rpx 24rpx;
-
-		.orderTitle {
-			margin-bottom: 24rpx;
-			display: flex;
-			justify-content: space-between;
-			height: 34rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			color: #2D2D2D;
-			line-height: 34rpx;
-
-			.total {
-				font-size: 24rpx;
-			}
-
-			.price {
-				.couponNum {
-					font-size: 28rpx;
-					color: #F42B17;
-				}
-				image {
-					width: 12rpx;
-					height: 18rpx;
-					margin-left: 18rpx;
-				}
-			}
-		}
-
-		.amount {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 20rpx;
-
-			.left {
-				width: 20rpx;
-				height: 34rpx;
-			}
-
-			.right {
-				display: flex;
-				align-items: center;
-
-				.totalNum {
-					height: 34rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #000000;
-					line-height: 34rpx;
-				}
-
-				.allPrice {
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 600;
-					color: #F42B17;
-					line-height: 34rpx;
-
-				}
-			}
-		}
-	}
-
-	.line {
-		width: 100%;
-		height: 0rpx;
-		opacity: 1;
-		border: 2rpx solid #F1F1F1;
-	}
-
-	.payType {
-		width: 694rpx;
-		height: 270rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 12rpx 0 0rpx 26rpx;
-		padding: 24rpx 26rpx 0;
-
-		.line {
-			margin-bottom: 24rpx;
-		}
-
-		.itemType {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 28rpx;
-
-			.payName {
-				display: flex;
-				align-items: center;
-				height: 42rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #000000;
-				line-height: 42rpx;
-
-				.payIcon {
-					width: 42rpx;
-					height: 42rpx;
-					margin-right: 16rpx;
-				}
-			}
-
-			.chose {
-				width: 34rpx;
-				height: 24rpx;
-				margin-right: 26rpx;
-			}
-		}
-	}
-
-	.footer {
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		background-color: #FFF;
-		bottom: 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		z-index: 22;
-		.meetPrice {
-			margin-left: 26rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			color: #000000;
-
-			.type {
-				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #F42B17;
-				margin-left: 12rpx;
-			}
-
-			.price {
-				font-size: 40rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 600;
-				color: #F42B17;
-			}
-		}
-
-		.btn {
-			width: 214rpx;
-			height: 74rpx;
-			background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
-			border-radius: 100rpx 100rpx 100rpx 100rpx;
-			opacity: 1;
-			text-align: center;
-			font-size: 28rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 74rpx;
-			margin-right: 20rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.orderTips {
+		width: 694rpx;
+		height: 342rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		opacity: 1;
+		margin: 12rpx 0 0 26rpx;
+		padding: 22rpx 36rpx 24rpx 24rpx;
+
+		.orderTitle {
+			margin-bottom: 24rpx;
+			display: flex;
+			justify-content: space-between;
+			height: 34rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #2D2D2D;
+			line-height: 34rpx;
+
+			.total {
+				font-size: 24rpx;
+			}
+
+			.price {
+				.couponNum {
+					font-size: 28rpx;
+					color: #F42B17;
+				}
+
+				image {
+					width: 12rpx;
+					height: 18rpx;
+					margin-left: 18rpx;
+				}
+			}
+		}
+
+		.amount {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 20rpx;
+
+			.left {
+				width: 20rpx;
+				height: 34rpx;
+			}
+
+			.right {
+				display: flex;
+				align-items: center;
+
+				.totalNum {
+					height: 34rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #000000;
+					line-height: 34rpx;
+				}
+
+				.allPrice {
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 600;
+					color: #F42B17;
+					line-height: 34rpx;
+
+				}
+			}
+		}
+	}
+
+	.line {
+		width: 100%;
+		height: 0rpx;
+		opacity: 1;
+		border: 2rpx solid #F1F1F1;
+	}
+
+	.payType {
+		width: 694rpx;
+		height: 270rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		opacity: 1;
+		margin: 12rpx 0 0rpx 26rpx;
+		padding: 24rpx 26rpx 0;
+
+		.line {
+			margin-bottom: 24rpx;
+		}
+
+		.itemType {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 28rpx;
+
+			.payName {
+				display: flex;
+				align-items: center;
+				height: 42rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #000000;
+				line-height: 42rpx;
+
+				.payIcon {
+					width: 42rpx;
+					height: 42rpx;
+					margin-right: 16rpx;
+				}
+			}
+
+			.chose {
+				width: 34rpx;
+				height: 24rpx;
+				margin-right: 26rpx;
+			}
 		}
-		
-
-	}
-</style>
\ No newline at end of file
+	}
+
+	.footer {
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		background-color: #FFF;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		z-index: 22;
+
+		.meetPrice {
+			margin-left: 26rpx;
+			font-size: 24rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #000000;
+
+			.type {
+				font-size: 24rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #F42B17;
+				margin-left: 12rpx;
+			}
+
+			.price {
+				font-size: 40rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 600;
+				color: #F42B17;
+			}
+		}
+
+		.btn {
+			width: 214rpx;
+			height: 74rpx;
+			background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
+			border-radius: 100rpx 100rpx 100rpx 100rpx;
+			opacity: 1;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 74rpx;
+			margin-right: 20rpx;
+		}
+
+
+	}
+</style>

From c4afe65700378c6a8085a51dfb487289dd748a51 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 10:49:41 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/sureOrder/index.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index 78d7685..68dd74d 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -441,7 +441,7 @@
 				setting: {},
 				timer: "",
 				distance_unit: "",
-				stockValue: '无货',
+				stockValue: '有货',
 				addressResult: {
 					province: '江苏省',
 					city: '南京市',
@@ -494,16 +494,21 @@
 						num: item.total_num
 					})
 				});
-				that.addressResult.province = order.address ? order.address.region.province : '江苏省'
-				that.addressResult.city = order.address ? order.address.region.city : '南京市'
-				that.addressResult.district = order.address ? order.address.region.region : '玄武区'
+				if(that.curDelivery == DeliveryTypeEnum.EXTRACT.value){
+					that.addressResult.province = order.extractShop ? order.extractShop.region.province : '江苏省'
+					that.addressResult.city = order.extractShop ? order.extractShop.region.city : '南京市'
+					that.addressResult.district = order.extractShop ? order.extractShop.region.region : '玄武区'
+				}else{
+					that.addressResult.province = order.address ? order.address.region.province : '江苏省'
+					that.addressResult.city = order.address ? order.address.region.city : '南京市'
+					that.addressResult.district = order.address ? order.address.region.region : '玄武区'
+				}
 				let params = {
 					list: list,
 					province: this.addressResult.province,
 					city: this.addressResult.city,
 					district: this.addressResult.district
 				}
-				console.log(params)
 				let {
 					status,
 					message,

From 5b4fbb49168ebd4bd56f8cff1f4646f62633da73 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 11:44:16 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=A0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue    |  2 +-
 pages/sureOrder/index.vue | 74 ++++++++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 4d4bc1a..19f3898 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -569,7 +569,7 @@
 					data
 				} = await GoodsApi.getGoodsStock(params);
 				if (status == 200) {
-					this.stockValue = data.stock
+					this.stockValue = data[0].state
 				}
 			},
 			async getProvinceAll() {
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index 68dd74d..326222f 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -124,28 +124,34 @@
 				<image :src="$picUrl+'/static/order/left.png'" mode="" class="leftIcon"></image>
 			</view>
 			<view class="goods" v-for="(item, index) in order.goodsList" :key="index">
-				<view class="goodsImg">
-					<image :src="item.goods_image" mode=""></image>
-				</view>
-				<view class="goodsInfo">
-					<view class="goodsName">
-						{{ item.goods_name }}
+				<view class="goodsBox" :style="{'opacity': item.stockValue=='有货'?1:0.6 }">
+					<view class="goodsImg">
+						<image :src="item.goods_image" mode=""></image>
 					</view>
-					<!-- 商品规格 -->
-					<view class="goods-props">
-						<view class="goods-props-item" v-for="(props, idx) in item.skuInfo.goods_props" :key="idx">
-							<text class="group-name">{{ props.group.name }}: </text>
-							<text>{{ props.value.name }}；</text>
+					<view class="goodsInfo">
+						<view class="goodsName">
+							{{ item.goods_name }}
+						</view>
+						<!-- 商品规格 -->
+						<view class="goods-props">
+							<view class="goods-props-item" v-for="(props, idx) in item.skuInfo.goods_props" :key="idx">
+								<text class="group-name">{{ props.group.name }}: </text>
+								<text>{{ props.value.name }}；</text>
+							</view>
+						</view>
+						<view class="goodsPrice">
+							￥ <text>{{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}</text>
 						</view>
 					</view>
-					<view class="goodsPrice">
-						￥ <text>{{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}</text>
+					<view class="goodsNum">
+						x{{ item.total_num }}
 					</view>
 				</view>
-				<view class="goodsNum">
-					x{{ item.total_num }}
+				<view style="color: red;font-size: 24rpx;margin-left: 182rpx;" v-if="item.stockValue=='无货'">
+					该商品暂时无货
 				</view>
 			</view>
+
 		</view>
 		<view class="timer">
 			<view class="youTime" style="width: 60rpx;">
@@ -246,11 +252,11 @@
 				<text class="type">￥</text>
 				<text class="price">{{order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice}}</text>
 			</view>
-			<view class="btn" @click="onSubmitOrder()" v-if="stockValue=='有货'">
+			<view class="btn" @click="onSubmitOrder()" v-if="stockValue==true">
 				提交订单
 			</view>
 			<view class="btn" style="background: #cecece;" v-else>
-				无货
+				提交订单
 			</view>
 		</view>
 		<!-- 优惠券弹出框 -->
@@ -441,7 +447,7 @@
 				setting: {},
 				timer: "",
 				distance_unit: "",
-				stockValue: '有货',
+				stockValue: true,
 				addressResult: {
 					province: '江苏省',
 					city: '南京市',
@@ -485,8 +491,8 @@
 
 		methods: {
 			async getGoodsStockInfor(order) {
-				console.log(order)
 				let that = this
+				let step = 0
 				let list = [];
 				order.goodsList.forEach(item => {
 					list.push({
@@ -494,11 +500,11 @@
 						num: item.total_num
 					})
 				});
-				if(that.curDelivery == DeliveryTypeEnum.EXTRACT.value){
+				if (that.curDelivery == DeliveryTypeEnum.EXTRACT.value) {
 					that.addressResult.province = order.extractShop ? order.extractShop.region.province : '江苏省'
 					that.addressResult.city = order.extractShop ? order.extractShop.region.city : '南京市'
 					that.addressResult.district = order.extractShop ? order.extractShop.region.region : '玄武区'
-				}else{
+				} else {
 					that.addressResult.province = order.address ? order.address.region.province : '江苏省'
 					that.addressResult.city = order.address ? order.address.region.city : '南京市'
 					that.addressResult.district = order.address ? order.address.region.region : '玄武区'
@@ -515,7 +521,22 @@
 					data
 				} = await GoodsApi.getGoodsStock(params);
 				if (status == 200) {
-					this.stockValue = data.stock
+					order.goodsList.forEach(item_1 => {
+						item_1.stockValue = '有货'
+						data.forEach(item_2 => {
+							if (item_1.goods_id == item_2.goods_id) {
+								item_1.stockValue = item_2.state
+							}
+							if (item_2.state == '无货') {
+								step++
+							}
+						});
+					});
+					if(step>0){
+						this.showToast('部分商品无货')
+					}
+					that.order = order
+					this.stockValue = step > 0 ? false : true
 				}
 			},
 			toStore() {
@@ -1316,10 +1337,13 @@
 		}
 
 		.goods {
-			display: flex;
-			align-items: center;
 			margin-top: 28rpx;
-			justify-content: space-between;
+
+			.goodsBox {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
 
 			.goodsImg {
 				width: 162rpx;

From 490f92ce2f96387a95ccc2b59a042b966d2a14e0 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 13:03:17 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 19f3898..39bd811 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -284,15 +284,12 @@
 							<template v-if="isSeckill">
 								<template v-if="isBuy">
 									<template v-if="seckillText=='距离'">
-										<view class="addCar" @click="choseSku(2)" v-if="stockValue=='有货'">
+										<view class="addCar" :style="{'background': stockValue=='有货'?'#FF9E2B':'#cecece' }" @click="stockValue=='有货'?choseSku(2):''">
 											加入购物车
 										</view>
-										<view class="buyNow" @click="choseSku(3)" v-if="stockValue=='有货'">
+										<view class="buyNow" :style="{'background': stockValue=='有货'?'linear-gradient(102deg, #FE5E06 0%, #F3221A 100%)':'#cecece' }" @click="stockValue=='有货'?choseSku(3):''" >
 											立即购买
 										</view>
-										<view class="btn-bg" v-if="stockValue=='无货'">
-											无货
-										</view>
 									</template>
 									<template v-else>
 										<view class="btn-bg">
@@ -307,15 +304,12 @@
 								</template>
 							</template>
 							<template v-else>
-								<view class="addCar" @click="choseSku(2)" v-if="stockValue=='有货'">
+								<view class="addCar" :style="{'background': stockValue=='有货'?'#FF9E2B':'#cecece' }" @click="stockValue=='有货'?choseSku(2):''">
 									加入购物车
 								</view>
-								<view class="buyNow" @click="choseSku(3)" v-if="stockValue=='有货'">
+								<view class="buyNow" :style="{'background': stockValue=='有货'?'linear-gradient(102deg, #FE5E06 0%, #F3221A 100%)':'#cecece' }" @click="stockValue=='有货'?choseSku(3):''">
 									立即购买
 								</view>
-								<view class="btn-bg" v-if="stockValue=='无货'">
-									无货
-								</view>
 							</template>
 						</template>
 						<template v-if="isPre">

From d6ab9e51c17a46f76d7744b7e80bca3cd11b5e17 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 15:26:08 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue   | 1 -
 pages/news1/feedback.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 39bd811..4fcbd39 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -836,7 +836,6 @@
 				})
 			},
 			onGetSku(e) {
-				console.log(e)
 				this.selectSku = e.selectSku
 				this.selectNum = e.shopNum
 			},
diff --git a/pages/news1/feedback.vue b/pages/news1/feedback.vue
index b25540f..e1ffe98 100644
--- a/pages/news1/feedback.vue
+++ b/pages/news1/feedback.vue
@@ -28,7 +28,7 @@
 						</u-radio-group>
 
 					</u-form-item>
-					<u-form-item label="反馈类型" label-width="170">
+					<u-form-item label="反馈店铺" label-width="170">
 						<u-radio-group v-model="form.shop">
 							<u-radio active-color="#FF4434" v-for="(item, index) in checkboxList2" :key="index"
 								:name="item.val">

From 322583721f1e6266e24c5cf28084a6208ffaa263 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 16:49:29 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=A7=92=E6=9D=80=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/components/SkuPopup.vue | 59 ++++++++++++++++--
 pages/goods/components/setPrice.vue | 96 ++++++++++++++---------------
 pages/goods/detail.vue              |  5 +-
 3 files changed, 102 insertions(+), 58 deletions(-)

diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue
index ca482e5..0ccd367 100644
--- a/pages/goods/components/SkuPopup.vue
+++ b/pages/goods/components/SkuPopup.vue
@@ -16,6 +16,7 @@
 	} from '@/utils/color'
 	import * as CartApi from '@/api/cart'
 	import GoodsSkuPopup from '@/components/goods-sku-popup'
+	import * as GoodsApi from '@/api/goods'
 
 	export default {
 		components: {
@@ -37,7 +38,15 @@
 			goods: {
 				type: Object,
 				default: {}
-			}
+			},
+			addressResult: {
+				type: Object,
+				default: {
+					province: '江苏省',
+					city: '南京市',
+					district: '玄武区'
+				}
+			},
 		},
 		data() {
 			return {
@@ -47,6 +56,7 @@
 				maxBuyNum: null,
 				selectSku: '',
 				shopNum: 1,
+				stockValue: '有货',
 			}
 		},
 		computed: {
@@ -204,11 +214,46 @@
 			closeSkuPopup() {
 				// console.log("监听 - 关闭sku组件")
 			},
-
+			async getGoodsStockInfor(selectShop, type) {
+				let that = this;
+				let params = {
+					list: [{
+						goods_id: that.goods.goods_id,
+						num: that.selectNum
+					}],
+					province: that.addressResult ? that.addressResult.province : '江苏省',
+					city: that.addressResult ? that.addressResult.city : '南京市',
+					district: that.addressResult ? that.addressResult.district : '玄武区'
+				}
+				let {
+					status,
+					message,
+					data
+				} = await GoodsApi.getGoodsStock(params);
+				if (status == 200) {
+					that.stockValue = data[0].state
+					if (that.stockValue == '无货') {
+						uni.showToast({
+							icon: "none",
+							title: "该商品暂时无货"
+						})
+					} else {
+						if (type == 1) {
+							that.addCartInfor(selectShop)
+						} else {
+							that.buyNowInfor(selectShop)
+						}
+					}
+				}
+			},
 			// 加入购物车按钮
 			addCart(selectShop) {
-				this.selectInfor = selectShop
 				const app = this
+				app.getGoodsStockInfor(selectShop, 1)
+			},
+			addCartInfor(selectShop) {
+				const app = this
+				app.selectInfor = selectShop
 				const {
 					goods_id,
 					goods_sku_id,
@@ -228,9 +273,13 @@
 						app.$emit('addCart', cartTotal)
 					})
 			},
-
 			// 立即购买
 			buyNow(selectShop) {
+				const app = this
+				app.getGoodsStockInfor(selectShop, 2)
+			},
+			buyNowInfor(selectShop) {
+				const app = this
 				this.selectInfor = selectShop
 				if (uni.getStorageSync("userInfo").user_type == 40) {
 					// 隐藏当前弹窗
@@ -248,7 +297,7 @@
 				})
 				// 隐藏当前弹窗
 				this.onChangeValue(false)
-			}
+			},
 
 		}
 	}
diff --git a/pages/goods/components/setPrice.vue b/pages/goods/components/setPrice.vue
index dbc7382..e9221b5 100644
--- a/pages/goods/components/setPrice.vue
+++ b/pages/goods/components/setPrice.vue
@@ -11,20 +11,20 @@
 							placeholder="秒杀价格可低于成本价" />
 					</view>
 					<view class="priceTime">
-						<view class="text">秒杀区间：</view>
-						<view class="priceDate">
-							<view class="selectTime" :style="'color: ' + (startTime?fontColor:'')"  @click="timeShow=true">
-								{{startTime?startTime:'起始时间'}}
-							</view>
-							<text>-</text>
-							<view class="selectTime" :style="'color: ' + (endTime?fontColor:'')"  @click="timeShow=true">
-								{{endTime?endTime:'终止时间'}}
-							</view>
+						<view class="text">开始时间：</view>
+						<view class="selectTime" :style="'color: ' + (startTime?fontColor:'')" @click="timeShow=true">
+							{{startTime?startTime:'起始时间'}}
 						</view>
 					</view>
-					<view class="priceCon" style="justify-content: space-between;">
+					<view class="priceCon" v-if="secondQuota">
+						<text>秒杀时长：</text>
+						<input type="number" style="width: 130rpx;margin-right: 15rpx;" class="input" v-model="sec_hour"
+							placeholder="请输入"> /小时
+					</view>
+					<view class="priceCon">
 						<text>秒杀限购：</text>
-						<u-switch v-model="secondQuota" size='35' @change="change" activeColor='#55BD6A' inactiveColor='#F1F1F1'>
+						<u-switch v-model="secondQuota" size='35' @change="change" activeColor='#55BD6A'
+							inactiveColor='#F1F1F1'>
 						</u-switch>
 					</view>
 					<view class="priceCon" v-if="secondQuota">
@@ -44,8 +44,8 @@
 			</view>
 		</u-popup>
 	</view>
-	<u-calendar v-model="timeShow" mode="multiple" minDate='0' @change="getTime" :pickerOptions="pickerOptions" range-color='#FF6257' range-bg-color='#FFBDBA'
-		active-bg-color='#FF6257'></u-calendar>
+	<u-calendar v-model="timeShow" mode="date" minDate='0' @change="getTime" :pickerOptions="pickerOptions"
+		range-color='#FF6257' range-bg-color='#FFBDBA' active-bg-color='#FF6257'></u-calendar>
 </template>
 
 <script>
@@ -55,28 +55,22 @@
 				afterSale: false,
 				timeShow: false,
 				startTime: '',
-				endTime: '',
+				sec_hour: '',
 				secondPrice: '',
 				secondQuota: 1,
 				quotaNum: '',
-				fontColor:'#262626',
-				pickerOptions:{  
-				    disabledDate(time){  
-				        return true  
-				    }  
-				} 
+				fontColor: '#262626',
 			}
 		},
 		methods: {
 			reset() {
 				this.startTime = null;
-				this.endTime = null
+				this.sec_hour = null
 				this.secondPrice = null;
 				this.quotaNum = null
 			},
 			getTime(e) {
-				this.startTime = e.startDate;
-				this.endTime = e.endDate;
+				this.startTime = e.result;
 			},
 			submit() {
 				if (!this.secondPrice) {
@@ -85,18 +79,18 @@
 				if (!this.startTime) {
 					return this.$toast('请选择开始时间')
 				}
-				if (!this.endTime) {
-					return this.$toast('请选择结束时间')
+				if (!this.sec_hour) {
+					return this.$toast('请输入秒杀时长')
 				}
-				if (!this.quotaNum&&this.secondQuota) {
+				if (!this.quotaNum && this.secondQuota) {
 					return this.$toast('请输入限购次数')
 				}
 				this.$emit('getprice', {
 					startTime: this.startTime,
-					endTime: this.endTime,
+					sec_hour: this.sec_hour,
 					secondPrice: this.secondPrice,
-					quotaNum: this.secondQuota?this.quotaNum:'',
-					secondQuota: this.secondQuota?1:2
+					quotaNum: this.secondQuota ? this.quotaNum : '',
+					secondQuota: this.secondQuota ? 1 : 2
 				})
 			}
 		}
@@ -108,6 +102,7 @@
 		background-color: #FF6257 !important;
 		border-color: #FF6257 !important;
 	}
+
 	.afterSales {
 		padding: 32upx;
 
@@ -154,6 +149,10 @@
 			}
 
 			.priceTime {
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+				color: #262626;
 				margin-bottom: 20rpx;
 
 				.text {
@@ -168,28 +167,23 @@
 					text-transform: none;
 				}
 
-				.priceDate {
-					display: flex;
-					align-items: center;
-
-					.selectTime {
-						width: 238rpx;
-						height: 70rpx;
-						background: #F3F3F3;
-						border-radius: 44rpx;
-						text-align: center;
-						line-height: 70rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #A1A1A1;
-						font-style: normal;
-						text-transform: none;
-					}
-
-					text {
-						margin: 0 15rpx;
-					}
+				.selectTime {
+					width: 300rpx;
+					height: 70rpx;
+					background: #F3F3F3;
+					border-radius: 44rpx;
+					text-align: center;
+					line-height: 70rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #A1A1A1;
+					font-style: normal;
+					text-transform: none;
+				}
+
+				text {
+					margin: 0 15rpx;
 				}
 			}
 
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 4fcbd39..d8e554e 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -409,7 +409,7 @@
 			<image :src="$picUrl+'/static/toTop.png?=1'"></image>
 		</view>
 		<view v-if="isTodo">
-			<SkuPopup v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @getSku='onGetSku'
+			<SkuPopup v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" :addressResult='addressResult' @getSku='onGetSku'
 				@addCart="onAddCart" />
 		</view>
 		<setPrice ref="setRange" @getprice="getprice" />
@@ -618,7 +618,7 @@
 					sku_id: that.goods.skuList[0].id,
 					seckill_price: e.secondPrice,
 					sec_start_time: e.startTime,
-					sec_end_time: e.endTime,
+					sec_hour: e.sec_hour,
 					is_limit: e.secondQuota,
 					limit_times: e.quotaNum
 				}
@@ -836,6 +836,7 @@
 				})
 			},
 			onGetSku(e) {
+				console.log(e)
 				this.selectSku = e.selectSku
 				this.selectNum = e.shopNum
 			},

From 51d23674a4a7659e4ca5752e7c8f462d7047337f Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 17:00:44 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/invoice/edit.vue | 6 +++---
 pages/order/index.vue  | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pages/invoice/edit.vue b/pages/invoice/edit.vue
index 60b8dab..40e618d 100644
--- a/pages/invoice/edit.vue
+++ b/pages/invoice/edit.vue
@@ -34,7 +34,7 @@
 					<view class="l">发票抬头：</view>
 					<view class="r">
 						<input type="text" v-model="array1[index1]" placeholder="请输入单位名称" />
-						<view class="tt" @click="bindPickerChange1" style="color: rgb(58, 134, 255;">更改抬头</view>
+						<view class="tt" @click="bindPickerChange1" style="color: rgb(58, 134, 255;">选择发票抬头</view>
 					</view>
 				</view>
 				<view class="item" v-if="tabIndex == 2">
@@ -192,7 +192,7 @@
 							icon: 'none',
 							duration: 2000
 						})
-						if (result.data.list.length.length > 0) {
+						if (result.data.length > 0) {
 							uni.navigateTo({
 								url: "/pages/invoice/detail?id=" + result.data.list[0].id
 							})
@@ -244,7 +244,7 @@
 			},
 			bindPickerChange1() {
 				uni.navigateTo({
-					url: "/pages/invoice/index?orderId=" + this.orderId +'&order='+(app.orderDetail?JSON.stringify(app.orderDetail):'')
+					url: "/pages/invoice/index?orderId=" + this.orderId +'&order='+(this.orderDetail?JSON.stringify(this.orderDetail):'')
 				})
 			}
 		}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index bc75a97..99546de 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -94,9 +94,7 @@
 						<!-- 		<view class="n"
 										v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 										@click="onAdress(order.goods_id)">修改地址</view> -->
-						<!-- <view class="n n-1"
-								v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.is_comment == 0"
-								@click="handleTargetComment(item.order_id)">评价</view> -->
+						<!-- <view class="n n-1" @click="onInvoicing(item.order_id,item)">评价</view> -->
 					</view>
 				</view>
 			</view>