商品变更编辑，新增，订单兑换优化

src/pages/index/conversion.vue

@@ -103,7 +103,6 @@ export default {
 
       orderDetail: uni.getStorageSync('orderDetail'),
 
-      type: false,
     };
   },
   filters :{
@@ -122,50 +121,33 @@ export default {
 
     //  确认兑换
     sureconvert() {
-      this.$mHelper.toast('click');
-      this.type = true;
-      // this.iconShow = true;
-      // this.masktxt = '是否兑换？';
-      // this.isShowMask = true;
-
+      let _self = this
       uni.showModal({
         content: '是否兑换？',
         success: confirmRes => {
           if (confirmRes.confirm) {
-            this.isSureConver()
-          }
-        }
-      });
-    },
-
-    // 监听遮罩层行为
-    isSureConver(e) {
-      // 兑换
-      if (this.type) {
-        if (e) {
-          this.$http
-            .get('/orders/verOrdersByNo/' + this.orderDetail.qrcode)
+            console.log(_self.orderDetail.qrcode);
+            if (!_self.orderDetail.qrcode) {
+              _self.$mHelper.toast('非自营订单无法兑换！')
+              return
+            }
+            _self.$http.get('/orders/verOrdersByNo/' + _self.orderDetail.qrcode)
             .then((res) => {
               console.log(res);
               if (res.code === 200 ) {
-                this.$mHelper.toast('核销成功！');
+                _self.$mHelper.toast('兑换成功！');
+                setTimeout(() => {
+                  _self.$mRouter.back()
+                }, 500);
               }
             }).catch(err0r=>{
-              this.$mHelper.toast(res.msg);
+              _self.$mHelper.toast(res.msg);
             });
-        } else {
-          this.$mHelper.toast('已取消核销该订单');
-        }
-      } else {  // 取消兑换
-        if (e) {
-          this.$mHelper.toast('已取消兑换')
-        } else {
-          this.isShowMask = false
-          return
+          } else {
+            _self.$mHelper.toast('兑换取消')
+          }
         }
-      }
-      this.isShowMask = false;
-      this.$mRouter.back();
+      });
     },
   },
 };

src/pages/index/index.vue

@@ -388,17 +388,17 @@ export default {
     this.getShopList();
     this.loading = false;
   },
-  // 页面生命周期 监听页面加载
-  onLoad() {
-    _self = this;
-    this.cWidth = uni.upx2px(690); // upx2px 转换为px
-    this.cHeight = uni.upx2px(300);
-    this.bWidth = uni.upx2px(690);
-    this.bHeight = uni.upx2px(300);
-
-    this.getShopList();
-    this.loading = false;
-  },
+  // // 页面生命周期 监听页面加载
+  // onLoad() {
+  //   _self = this;
+  //   this.cWidth = uni.upx2px(690); // upx2px 转换为px
+  //   this.cHeight = uni.upx2px(300);
+  //   this.bWidth = uni.upx2px(690);
+  //   this.bHeight = uni.upx2px(300);
+
+  //   this.getShopList();
+  //   this.loading = false;
+  // },
 
   methods: {
     // 监听遮罩层行为

src/pages/index/setting/notice.vue

@@ -1,7 +1,7 @@
 <!-- 公告管理 -->
 <template>
   <view class="notice">
-    <Header :title="title"></Header>
+    <!-- <Header :title="title"></Header> -->
     <view class="btn-add">
       <image
         src="../../../static/images/addicon.png"
@@ -9,7 +9,7 @@
         @tap="topage('add')"
       ></image>
     </view>
-    <view style="height: 94upx;"></view>
+    <!-- <view style="height: 94upx;"></view> -->
     <view class="notice-content">
       <view class="item" v-for="item in noticeList" :key="item.id">
         <view class="notice-top">

src/pages/shop/classify.vue

@@ -1,11 +1,9 @@
 <!-- 管理分类 -->
 <template>
   <view class="classify">
-    <Header :title="title" />
     <view class="addClass" @tap="compile('add')">
       <image src="../../static/images/addicon.png" class="addicon"></image>
     </view>
-    <view style="height: 94upx;"></view>
     <view class="content">
       <view class="item-warp" v-for="item in lineList" :key="item.id">
         <view class="warp-top">

src/pages/shop/shop.vue

@@ -126,7 +126,7 @@
           </view>
 
           <view class="right"
-            >￥<text class="price">{{ item.price | dounit}}</text></view
+            >￥<text class="price">{{ item.price | dounit }}</text></view
           >
         </view>
         <view class="operate">
@@ -159,7 +159,7 @@
           </view>
 
           <view class="right"
-            >￥<text class="price">{{ item.price | dounit}}</text></view
+            >￥<text class="price">{{ item.price | dounit }}</text></view
           >
         </view>
         <view class="operate">
@@ -173,28 +173,17 @@
 
     <uni-load-more :status="more"> </uni-load-more>
     <rf-loading v-if="loading"></rf-loading>
-    <mask
-      :txt="masktxt"
-      :iconShow="iconShow"
-      v-if="isShowMask"
-      @isSureConver="isSureConver"
-    ></mask>
   </view>
 </template>
 
 <script>
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import mask from '../components/mask';
 export default {
   name: 'order',
-  components: { uniLoadMore, mask },
+  components: { uniLoadMore },
   data() {
     //这里存放数据
     return {
-      // 遮罩层
-      isShowMask: false,
-      iconShow: false,
-      masktxt: '',
       deleteId: '',
 
       scenicID: 0, // 景区id 唯一（一个账号代表一个景区）
@@ -241,13 +230,13 @@ export default {
         return '审核未通过';
       }
     },
-    dounit (val) {
+    dounit(val) {
       if (val) {
-        return (val/100)
+        return val / 100;
       } else {
-        return '0.00'
+        return '0.00';
       }
-    }
+    },
   },
   // 下拉刷新
   onPullDownRefresh() {
@@ -278,7 +267,6 @@ export default {
     this.getShopMessage();
   },
   onLoad() {
-
     this.getShopList();
     this.getShopMessage();
   },
@@ -293,23 +281,24 @@ export default {
     },
     // 删除商品
     async deleteshop(id) {
+      let _self = this
       this.deleteId = id;
-      this.masktxt = '是否删除该商品？';
-      this.isShowMask = true;
-    },
-    // 监听遮罩层行为
-    isSureConver(e) {
-      if (e) {
-        this.$http.delete('/goods/del/' + this.deleteId).then(async (res) => {
-          if (res.code === 200 && res.msg === 'OK') {
-            this.$mHelper.toast('删除成功');
-            setTimeout(() => {
-              this.getTicketShopList();
-            }, 500);
+      uni.showModal({
+        content: '是否删除该商品？',
+        success: (confirmRes) => {
+          if (confirmRes.confirm) {
+            _self.$http.delete('/goods/del/' + this.deleteId)
+              .then(async (res) => {
+                if (res.code === 200 && res.msg === 'OK') {
+                  _self.$mHelper.toast('删除成功');
+                  setTimeout(() => {
+                    _self.getTicketShopList();
+                  }, 500);
+                }
+              });
           }
-        });
-      }
-      this.isShowMask = false;
+        },
+      });
     },
     // 根据名字搜索
     searchByname() {
@@ -344,7 +333,7 @@ export default {
           this.getTicketShopList();
         }
       });
-      uni.stopPullDownRefresh()  // 关闭下拉刷新
+      uni.stopPullDownRefresh(); // 关闭下拉刷新
     },
     // 待审核tab切换
     changeTabByStatus(type, status) {
@@ -421,8 +410,7 @@ export default {
       });
     },
     // 通过审核
-    passGet(id) {
-    },
+    passGet(id) {},
     // 下架
     shopPutDown(id) {
       this.changeShopStatus(id, this.params.upDown);

src/pages/shop/shopdetail.vue

@@ -1,354 +1,354 @@
 <template>
-	<view class="shopdetail">
-		<!-- <Header :title="title"></Header>
+  <view class="shopdetail">
+    <!-- <Header :title="title"></Header>
     <view class="" style="height: 94upx;"></view> -->
-		<view class="shopdetail-content">
-			<!-- 所属店铺 -->
-			<view class="shop detail-list">
-				<view class="menu">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker
-								class="selectlist"
-								mode="selector"
-								@change="changeStore"
-								:value="storeIndex"
-								:range="storeList"
-								:disabled="storeDisable"
-								range-key="name"
-							>
-								<view class="uni-input title">{{
-									storeList[storeIndex].name
-								}}</view>
-							</picker>
-							<image
-								src="../../static/images/moreicon.png"
-								class="more"
-							></image>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 商品类型 -->
-			<view class="shoptype detail-list noborder">
-				<view class="menu">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker
-								@change="changeType"
-								:value="typeIndex"
-								:range="typeList"
-								:disabled="typeDisabled"
-								range-key="name"
-								class="selectlist"
-							>
-								<view class="uni-input title">{{
-									typeList[typeIndex].name
-								}}</view>
-							</picker>
-							<image
-								src="../../static/images/moreicon.png"
-								class="more"
-							></image>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 商品名称 -->
-			<view class="shopname detail-list">
-				<view class="menu" v-if="hasNameList === 1">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker
-								@change="changeShop"
-								:value="shopIndex"
-								:range="shopList"
-								range-key="name"
-								class="selectlist"
-							>
-								<view class="uni-input title">{{
-									shopList[shopIndex].name
-								}}</view>
-							</picker>
-							<image
-								src="../../static/images/moreicon.png"
-								class="more"
-							></image>
-						</view>
-					</view>
-				</view>
-				<view class="menu" v-if="hasNameList === 0">
-					<input
-						class="input-shopname"
-						type="text"
-						v-model="shopname"
-						placeholder-style="color:#a2a8a8;font-size:28upx"
-						placeholder="请输入商品名称"
-					/>
-				</view>
-			</view>
-			<!-- 自定义分类 -->
-			<view class="classify detail-list noborder">
-				<view class="menu">
-					<view class="title bigtitle">自定义分类</view>
-					<view class="txt" @tap="toClassify">管理分类</view>
-				</view>
-			</view>
-			<!-- 西线推荐 -->
-			<view class="xiline detail-list">
-				<view class="menu">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker
-								@change="changeClassify"
-								:value="lineIndex"
-								:range="lineList"
-								:disabled="lineDidsable"
-								range-key="name"
-								class="selectlist"
-							>
-								<view class="uni-input title">{{
-									lineList[lineIndex].name
-								}}</view>
-							</picker>
-							<image
-								src="../../static/images/moreicon.png"
-								class="more"
-							></image>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 账号限制 -->
-			<view class="warp" v-if="typeProperty === '1'">
-				<view class="idastrict detail-list">
-					<view class="menu">
-						<view class="title astricttitle">账号限制</view>
-						<switch :checked="showoperat" @change="Change" />
-					</view>
-				</view>
-				<view class="detail-list operat" v-if="showoperat">
-					<view class="menu">
-						<view class="title">同一账号在</view>
-						<view class="sub" @tap="subtractUser">-</view>
-						<text class="num1">{{ num1 }}</text>
-						<view class="add" @tap="addUser">+</view>
-						<view class="txt">天内最多购买</view>
-						<view class="sub" @tap="subtractDate">-</view
-						><text class="num2">{{ num2 }}</text
-						><view class="add" @tap="addDate">+</view
-						><text class="unit">张</text>
-					</view>
-				</view>
-			</view>
-			<view class="warp" v-if="typeProperty === '0'">
-				<!-- 卖价 -->
-				<view class="price-warp">
-					<view class="name">卖价：</view>
-					<input
-						class="price"
-						type="text"
-						v-model="price"
-						placeholder="请输入卖价"
-					/>
-				</view>
-				<!-- 打折价 -->
-				<view class="price-warp">
-					<view class="name">划线价：</view>
-					<input
-						class="price"
-						type="text"
-						v-model="rateprice"
-						placeholder="请输入划线价"
-					/>
-				</view>
-				<!-- 销售属性 -->
-				<view class="property">
-					<view class="property-warp">
-						<view class="title">销售属性</view>
-						<view class="date">
-							<view class="namebar">过期日期：</view>
-							<view class="num" @tap="openTime"> {{ expirationDate }}</view>
-						</view>
-						<view class="pattern">
-							<view class="uni-list">
-								<radio-group @change="radioChange">
-									<label
-										class="uni-list-cell uni-list-cell-pd pattern-item"
-										v-for="(item, index) in patterList"
-										:key="index"
-									>
-										<view class="checkth">
-											<radio
-												:value="item.id"
-												:checked="index === patterIndex"
-											/>
-										</view>
-										<view class="txt">
-											<text class="txt1"> {{ item.name }}</text>
-											<text> {{ item.know }}</text>
-										</view>
-									</label>
-								</radio-group>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 商品库存 -->
-				<view class="property">
-					<view class="property-warp">
-						<view class="title">商品库存</view>
-						<view class="pattern">
-							<view class="uni-list">
-								<radio-group @change="shopNumChange">
-									<label
-										class="uni-list-cell uni-list-cell-pd pattern-item"
-										v-for="(item, index) in shopNumList"
-										:key="index"
-									>
-										<view class="checkth">
-											<radio
-												:value="item.id"
-												:checked="index === shopNumIndex"
-											/>
-										</view>
-										<view class="txt">
-											<text class="txt1"> {{ item.name }}</text>
-											<text> {{ item.know }}</text>
-											<view
-												class="inventory"
-												v-if="item.name === '限日库存模式'"
-											>
-												<text class="name">日库存数：</text>
-												<input
-													class="dateInventory"
-													type="text"
-													placeholder="请输入库存数量"
-													v-model="dateInventory"
-												/>
-											</view>
-											<view
-												class="inventory"
-												v-if="item.name === '限总库存模式'"
-											>
-												<text class="name">总库存数：</text>
-												<input
-													class="dateInventory"
-													type="text"
-													placeholder="请输入库存数量"
-													v-model="sunInventory"
-												/>
-											</view>
-										</view>
-									</label>
-								</radio-group>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 预定规则 -->
-				<view class="booking">
-					<view class="booking-warp">
-						<view class="title">预定规则</view>
-						<view class="model">
-							<view class="inputnum">
-								<text class="bar">预定数量：</text>
-								<input
-									class="bookingnum"
-									v-model="bookingnum"
-									type="text"
-									placeholder="请输入数量"
-								/>
-							</view>
-							<view class="txt">一天内同一身份证可预定数量</view>
-						</view>
-						<view class="truename">
-							<view class="truename-warp">
-								<view class="txt">是否开启实名制购票</view>
-								<switch :checked="trueNme" @change="trueNmeChange" />
-							</view>
-						</view>
-						<view class="modeltwo">
-							<view class="uni-list">
-								<radio-group @change="bookingChange">
-									<label
-										class="uni-list-cell uni-list-cell-pd booking-item"
-										v-for="(item, index) in bookingList"
-										:key="index"
-									>
-										<view class="checkth">
-											<radio
-												:value="item.id"
-												:checked="index === bookingIndex"
-											/>
-										</view>
-										<view class="txt">{{ item.name }}</view>
-									</label>
-								</radio-group>
-							</view>
-						</view>
-						<view class="truename">
-							<view class="truename-warp">
-								<view class="txt">订单显示二维码</view>
-								<switch :checked="codeShow" @change="codeShowChange" />
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 商品图标 -->
-			<view class="shopicon">商品图标</view>
-			<view class="iconcontent">
-				<image class="shopLogo" :src="iconurl" v-if="iconurl"></image>
-				<text class="icon" @tap="uploadImg">点击上传</text>
-				<text class="per">{{ progress }}%</text>
-			</view>
-			<view class="shopicon">商品图册</view>
-			<view class="uploading">
-				<view class="item-warp" v-for="(item, index) in pickList" :key="index">
-					<view class="img-warp">
-						<image :src="item" class="item list"></image>
-						<view class="delete">
-							<image
-								src="../../static/images/delete.png"
-								class="delete-icon"
-								@tap="deleteThisImg(index)"
-							></image>
-						</view>
-					</view>
-				</view>
-				<view class="item-warp">
-					<image
-						src="../../static/images/upload.png"
-						class="item upload"
-						@tap="uploadList"
-					></image>
-				</view>
-			</view>
-			<!-- 购票须知 -->
-			<view class="shopicon">商品描述（购票须知）</view>
-			<view class="know">
-				<view class="container">
-					<editor
-						id="editor"
-						class="ql-container"
-						:placeholder="placeholder"
-						@input="saveTxt"
-						@ready="onEditorReady"
-					></editor>
-				</view>
-			</view>
+    <view class="shopdetail-content">
+      <!-- 所属店铺 -->
+      <view class="shop detail-list">
+        <view class="menu">
+          <view class="uni-list-cell">
+            <view class="uni-list-cell-db">
+              <picker
+                class="selectlist"
+                mode="selector"
+                @change="changeStore"
+                :value="storeIndex"
+                :range="storeList"
+                :disabled="storeDisable"
+                range-key="name"
+              >
+                <view class="uni-input title">{{
+                  storeList[storeIndex].name
+                }}</view>
+              </picker>
+              <image
+                src="../../static/images/moreicon.png"
+                class="more"
+              ></image>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 商品类型 -->
+      <view class="shoptype detail-list noborder">
+        <view class="menu">
+          <view class="uni-list-cell">
+            <view class="uni-list-cell-db">
+              <picker
+                @change="changeType"
+                :value="typeIndex"
+                :range="typeList"
+                :disabled="typeDisabled"
+                range-key="name"
+                class="selectlist"
+              >
+                <view class="uni-input title">{{
+                  typeList[typeIndex].name
+                }}</view>
+              </picker>
+              <image
+                src="../../static/images/moreicon.png"
+                class="more"
+              ></image>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 商品名称 -->
+      <view class="shopname detail-list">
+        <view class="menu" v-if="hasNameList === 1">
+          <view class="uni-list-cell">
+            <view class="uni-list-cell-db">
+              <picker
+                @change="changeShop"
+                :value="shopIndex"
+                :range="shopList"
+                range-key="name"
+                class="selectlist"
+              >
+                <view class="uni-input title">{{
+                  shopList[shopIndex].name
+                }}</view>
+              </picker>
+              <image
+                src="../../static/images/moreicon.png"
+                class="more"
+              ></image>
+            </view>
+          </view>
+        </view>
+        <view class="menu" v-if="hasNameList === 0">
+          <input
+            class="input-shopname"
+            type="text"
+            v-model="shopname"
+            placeholder-style="color:#a2a8a8;font-size:28upx"
+            placeholder="请输入商品名称"
+          />
+        </view>
+      </view>
+      <!-- 自定义分类 -->
+      <view class="classify detail-list noborder">
+        <view class="menu">
+          <view class="title bigtitle">自定义分类</view>
+          <view class="txt" @tap="toClassify">管理分类</view>
+        </view>
+      </view>
+      <!-- 西线推荐 -->
+      <view class="xiline detail-list">
+        <view class="menu">
+          <view class="uni-list-cell">
+            <view class="uni-list-cell-db">
+              <picker
+                @change="changeClassify"
+                :value="lineIndex"
+                :range="lineList"
+                :disabled="lineDidsable"
+                range-key="name"
+                class="selectlist"
+              >
+                <view class="uni-input title">{{
+                  lineList[lineIndex].name
+                }}</view>
+              </picker>
+              <image
+                src="../../static/images/moreicon.png"
+                class="more"
+              ></image>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 账号限制 -->
+      <view class="warp" v-if="typeProperty === '1'">
+        <view class="idastrict detail-list">
+          <view class="menu">
+            <view class="title astricttitle">账号限制</view>
+            <switch :checked="showoperat" @change="Change" />
+          </view>
+        </view>
+        <view class="detail-list operat" v-if="showoperat">
+          <view class="menu">
+            <view class="title">同一账号在</view>
+            <view class="sub" @tap="subtractUser">-</view>
+            <text class="num1">{{ astrictDate.data.saleDay }}</text>
+            <view class="add" @tap="addUser">+</view>
+            <view class="txt">天内最多购买</view>
+            <view class="sub" @tap="subtractDate">-</view
+            ><text class="num2">{{ astrictDate.data.saleNum }}</text
+            ><view class="add" @tap="addDate">+</view
+            ><text class="unit">张</text>
+          </view>
+        </view>
+      </view>
+      <view class="warp" v-if="typeProperty === '0'">
+        <!-- 卖价 -->
+        <view class="price-warp">
+          <view class="name">卖价：</view>
+          <input
+            class="price"
+            type="text"
+            v-model="price"
+            placeholder="请输入卖价"
+          />
+        </view>
+        <!-- 打折价 -->
+        <view class="price-warp">
+          <view class="name">划线价：</view>
+          <input
+            class="price"
+            type="text"
+            v-model="rateprice"
+            placeholder="请输入划线价"
+          />
+        </view>
+        <!-- 销售属性 -->
+        <view class="property">
+          <view class="property-warp">
+            <view class="title">销售属性</view>
+            <view class="date">
+              <view class="namebar">过期日期：</view>
+              <view class="num" @tap="openTime"> {{ expirationDate }}</view>
+            </view>
+            <view class="pattern">
+              <view class="uni-list">
+                <radio-group @change="radioChange">
+                  <label
+                    class="uni-list-cell uni-list-cell-pd pattern-item"
+                    v-for="(item, index) in patterList"
+                    :key="index"
+                  >
+                    <view class="checkth">
+                      <radio
+                        :value="item.id"
+                        :checked="index === patterIndex"
+                      />
+                    </view>
+                    <view class="txt">
+                      <text class="txt1"> {{ item.name }}</text>
+                      <text> {{ item.know }}</text>
+                    </view>
+                  </label>
+                </radio-group>
+              </view>
+            </view>
+          </view>
+        </view>
+        <!-- 商品库存 -->
+        <view class="property">
+          <view class="property-warp">
+            <view class="title">商品库存</view>
+            <view class="pattern">
+              <view class="uni-list">
+                <radio-group @change="shopNumChange">
+                  <label
+                    class="uni-list-cell uni-list-cell-pd pattern-item"
+                    v-for="(item, index) in shopNumList"
+                    :key="index"
+                  >
+                    <view class="checkth">
+                      <radio
+                        :value="item.id"
+                        :checked="index === shopNumIndex"
+                      />
+                    </view>
+                    <view class="txt">
+                      <text class="txt1"> {{ item.name }}</text>
+                      <text> {{ item.know }}</text>
+                      <view
+                        class="inventory"
+                        v-if="item.name === '限日库存模式'"
+                      >
+                        <text class="name">日库存数：</text>
+                        <input
+                          class="dateInventory"
+                          type="text"
+                          placeholder="请输入库存数量"
+                          v-model="dateInventory"
+                        />
+                      </view>
+                      <view
+                        class="inventory"
+                        v-if="item.name === '限总库存模式'"
+                      >
+                        <text class="name">总库存数：</text>
+                        <input
+                          class="dateInventory"
+                          type="text"
+                          placeholder="请输入库存数量"
+                          v-model="sunInventory"
+                        />
+                      </view>
+                    </view>
+                  </label>
+                </radio-group>
+              </view>
+            </view>
+          </view>
+        </view>
+        <!-- 预定规则 -->
+        <view class="booking">
+          <view class="booking-warp">
+            <view class="title">预定规则</view>
+            <view class="model">
+              <view class="inputnum">
+                <text class="bar">预定数量：</text>
+                <input
+                  class="bookingnum"
+                  v-model="astrictDate.data.bookRule"
+                  type="text"
+                  placeholder="请输入数量"
+                />
+              </view>
+              <view class="txt">一天内同一身份证可预定数量</view>
+            </view>
+            <view class="truename">
+              <view class="truename-warp">
+                <view class="txt">是否开启实名制购票</view>
+                <switch :checked="trueNme" @change="trueNmeChange" />
+              </view>
+            </view>
+            <view class="modeltwo">
+              <view class="uni-list">
+                <radio-group @change="bookingChange">
+                  <label
+                    class="uni-list-cell uni-list-cell-pd booking-item"
+                    v-for="(item, index) in bookingList"
+                    :key="index"
+                  >
+                    <view class="checkth">
+                      <radio
+                        :value="item.id"
+                        :checked="index === bookingIndex"
+                      />
+                    </view>
+                    <view class="txt">{{ item.name }}</view>
+                  </label>
+                </radio-group>
+              </view>
+            </view>
+            <view class="truename">
+              <view class="truename-warp">
+                <view class="txt">订单显示二维码</view>
+                <switch :checked="codeShow" @change="codeShowChange" />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 商品图标 -->
+      <view class="shopicon">商品图标</view>
+      <view class="iconcontent">
+        <image class="shopLogo" :src="iconurl" v-if="iconurl"></image>
+        <text class="icon" @tap="uploadImg">点击上传</text>
+        <text class="per">{{ progress }}%</text>
+      </view>
+      <view class="shopicon">商品图册</view>
+      <view class="uploading">
+        <view class="item-warp" v-for="(item, index) in pickList" :key="index">
+          <view class="img-warp">
+            <image :src="item" class="item list"></image>
+            <view class="delete">
+              <image
+                src="../../static/images/delete.png"
+                class="delete-icon"
+                @tap="deleteThisImg(index)"
+              ></image>
+            </view>
+          </view>
+        </view>
+        <view class="item-warp">
+          <image
+            src="../../static/images/upload.png"
+            class="item upload"
+            @tap="uploadList"
+          ></image>
+        </view>
+      </view>
+      <!-- 购票须知 -->
+      <view class="shopicon">商品描述（购票须知）</view>
+      <view class="know">
+        <view class="container">
+          <editor
+            id="editor"
+            class="ql-container"
+            :placeholder="placeholder"
+            @input="saveTxt"
+            @ready="onEditorReady"
+          ></editor>
+        </view>
+      </view>
 
-			<view class="btn" @tap="submitMesage">确认</view>
-			<rf-loading v-if="loading"></rf-loading>
-			<uni-calendar
-				ref="calendar"
-				:insert="false"
-				:range="false"
-				@confirm="confirm"
-			/>
-		</view>
-	</view>
+      <view class="btn" @tap="submitMesage">确认</view>
+      <rf-loading v-if="loading"></rf-loading>
+      <uni-calendar
+        ref="calendar"
+        :insert="false"
+        :range="false"
+        @confirm="confirm"
+      />
+    </view>
+  </view>
 </template>
 
 <script>
@@ -357,858 +357,953 @@ import Header from '../components/header.vue';
 import uniCalendar from '@/components/uni-calendar/uni-calendar.vue';
 import moment from '@/common/moment';
 export default {
-	components: {
-		Header,
-		uniCalendar
-	},
-	data() {
-		return {
-			loading: false,
-			scenicId: uni.getStorageSync('scenicId'),
-			title: '商品详情',
-			num1: 1,
-			num2: 10,
-			showoperat: false,
+  components: {
+    Header,
+    uniCalendar,
+  },
+  data() {
+    return {
+      loading: false,
+      scenicId: uni.getStorageSync('scenicId'),
+      title: '商品详情',
+      showoperat: false,
 
-			placeholder: '请输入内容...',
-			mastKnow: '',
+      placeholder: '请输入内容...',
+      mastKnow: '',
 
-			storeList: [{ name: '所属店铺', id: '', type: '' }],
-			storeIndex: 0,
-			storeId: '',
-			storeDisable: true,
-			typeProperty: '0', // 判断所属店铺是否是自营店铺  1分销  0自营
+      storeList: [{ name: '所属店铺', id: '', type: '' }],
+      storeIndex: 0,
+      storeId: '',
+      storeDisable: true,
+      typeProperty: '1', // 判断所属店铺是否是自营店铺  1分销  0自营
 
-			typeList: [{ name: '商品类型(请先选择所属店铺)', id: '' }],
-			typeIndex: 0,
-			typeId: '',
-			typeDisabled: true,
+      typeList: [{ name: '商品类型(请先选择所属店铺)', id: '' }],
+      typeIndex: 0,
+      typeId: '',
+      typeDisabled: true,
 
-			shopList: [{ name: '商品名称(请先选择商品类型)', id: '' }],
-			shopIndex: 0,
-			shopId: '',
-			shopname: '',
+      shopList: [{ name: '商品名称(请先选择商品类型)', id: '' }],
+      shopIndex: 0,
+      shopId: '',
+      shopname: '',
 
-			hasNameList: 0, // 判断是否有商品名称列表
+      hasNameList: 0, // 判断是否有商品名称列表
 
-			lineList: [{ name: '分类(请先选择所属商品)', id: '' }],
-			lineIndex: 0,
-			lineId: '',
-			lineDidsable: true,
+      lineList: [{ name: '分类(请先选择所属商品)', id: '' }],
+      lineIndex: 0,
+      lineId: '',
+      lineDidsable: true,
 
-			// 图标上传
-			progress: 0,
-			iconurl: '',
-			pickList: [],
-			Icon: '',
-			Imglist: [],
+      // 图标上传
+      progress: 0,
+      iconurl: '',
+      pickList: [],
+      Icon: '',
+      Imglist: [],
 
-			price: 0.0,
-			rateprice: 0.0,
+      price: 0.0,
+      rateprice: 0.0,
 
-			// -------------- 编辑分界线 ------------------------------------
+      // -------------- 编辑分界线 ------------------------------------
 
-			SHOPID: 0,
-			shopData: {},
-			
-			expirationDate: moment().format('YYYY-MM-DD'),
-			// 销售属性
-			patterList: [
-				{
-					id: '0',
-					name: '有效期模式',
-					know: '无需用户指定使用日，在过期时间前均可使用。'
-				},
-				{
-					id: '1',
-					name: '使用旧模式',
-					know: '用户购买时需选择游玩日，并在游玩日当天使用。'
-				}
-			],
-			patterIndex: 0,
+      SHOPID: 0,
+      shopData: {},
 
-			// 商品库存
-			shopNumList: [
-				{
-					id: '0',
-					name: '无限库存模式',
-					know: '售卖商品不计算库存，无限售卖。'
-				},
-				{ id: '1', name: '限日库存模式', know: '每日固定库存售卖。' },
-				{ id: '2', name: '限总库存模式', know: '总库存限制，卖完为止。' }
-			],
-			shopNumIndex: 0,
-			dateInventory: 99,
-			sunInventory: 999,
+      expirationDate: '商品过期日期',
+      // 销售属性
+      patterList: [
+        {
+          id: '0',
+          name: '有效期模式',
+          know: '无需用户指定使用日，在过期时间前均可使用。',
+        },
+        {
+          id: '1',
+          name: '使用日模式',
+          know: '用户购买时需选择游玩日，并在游玩日当天使用。',
+        },
+      ],
+      patterIndex: 0,
 
-			bookingnum: 111,
+      // 商品库存
+      shopNumList: [
+        {
+          id: '0',
+          name: '无限库存模式',
+          know: '售卖商品不计算库存，无限售卖。',
+        },
+        { id: '1', name: '限日库存模式', know: '每日固定库存售卖。' },
+        { id: '2', name: '限总库存模式', know: '总库存限制，卖完为止。' },
+      ],
+      shopNumIndex: 0,
 
-			bookingList: [
-				{ id: '0', name: '未消费统一可退' },
-				{ id: '1', name: '过期不可退' },
-				{ id: '2', name: '统一不可退' }
-			],
-			bookingIndex: 0,
+      dateInventory: '',
+      sunInventory: '',
+      inventory: '',
 
-			trueNme: true,
-			codeShow: true
-		};
-	},
-	onUnload() {
-		uni.removeStorageSync('Id');
-	},
-	onLoad() {
-		myCloud = uniCloud.init({
-			provider: 'aliyun',
-			spaceId: 'db8671a1-69bd-470d-ad59-ba927c88f4a4',
-			clientSecret: '8nOzV70edtpCd0El6qce3g=='
-		});
+      bookingnum: '',
 
-		this.getShopList();
+      bookingList: [
+        { id: '0', name: '未消费统一可退' },
+        { id: '1', name: '过期不可退' },
+        { id: '2', name: '统一不可退' },
+      ],
+      bookingIndex: 0,
 
-		// ---------------------------------------------------
-		this.SHOPID = uni.getStorageSync('Id');
-		if (this.SHOPID) {
-			this.getShopBuyId();
-		}
-	},
-	methods: {
-		// 打开日历
-		openTime() {
+      trueNme: false,
+      codeShow: false,
+
+      // 规则参数
+      astrictDate: {
+        data: {
+          saleDay: 1, // 限购天数
+          saleNum: 1, // 限购票数
+          dateSetting: '', // 有效期模式
+          goodsStockFlag: '', // 库存模式
+          bookRule: '', // 同一天限购
+          usubscribeRule: '', // 可退规则
+          isRealName: '', // 开启实名制
+          isShowQrcode: '', // 显示二维码
+        },
+      }
+    };
+  },
+  onUnload() {
+    uni.removeStorageSync('Id');
+  },
+  onLoad() {
+    myCloud = uniCloud.init({
+      provider: 'aliyun',
+      spaceId: 'db8671a1-69bd-470d-ad59-ba927c88f4a4',
+      clientSecret: '8nOzV70edtpCd0El6qce3g==',
+    });
+
+    this.getShopList();
+
+    // ---------------------------------------------------
+    this.SHOPID = uni.getStorageSync('Id');
+    if (this.SHOPID) {
+      this.getShopBuyId();
+    }
+  },
+  methods: {
+    // 打开日历
+    openTime() {
       this.$refs.calendar.open();
-		},
-		confirm (e) {
-			console.log(e);
-			this.expirationDate = e.fulldate
-		},
-		// 单选自定义属性
-		radioChange: function(evt) {
-			for (let i = 0; i < this.patterList.length; i++) {
-				if (this.patterList[i].id === evt.target.value) {
-					this.patterIndex = i;
-					break;
-				}
-			}
-		},
-		// 单选库存模式
-		shopNumChange(e) {
-			for (let i = 0; i < this.shopNumList.length; i++) {
-				if (this.shopNumList[i].id === e.target.value) {
-					this.shopNumIndex = i;
-					break;
-				}
-			}
-		},
-		// 单选可退模式
-		bookingChange(e) {
-			for (let i = 0; i < this.bookingList.length; i++) {
-				if (this.bookingList[i].id === e.target.value) {
-					this.bookingIndex = i;
-					break;
-				}
-			}
-		},
-		// 实名制
-		trueNmeChange(e) {
-			console.log(e.detail.value);
-		},
-		// 显示二维码
-		codeShowChange(e) {
-			console.log(e.detail.value);
-		},
-		// 获取单个商品信息
-		async getShopBuyId() {
-			if (!this.SHOPID) return;
-			await this.$http.get('/goods/getById/' + this.SHOPID).then(async res => {
-				if (res.code === 200 && res.msg === 'OK') {
-					this.shopData = res.data;
+    },
+    confirm(e) {
+      this.expirationDate = e.fulldate;
+    },
+    // 单选自定义属性
+    radioChange: function (evt) {
+      for (let i = 0; i < this.patterList.length; i++) {
+        if (this.patterList[i].id === evt.target.value) {
+          this.patterIndex = i;
+          break;
+        }
+      }
+      this.astrictDate.data.dateSetting = evt.detail.value;
+    },
+    // 单选库存模式
+    shopNumChange(e) {
+      for (let i = 0; i < this.shopNumList.length; i++) {
+        if (this.shopNumList[i].id === e.target.value) {
+          this.shopNumIndex = i;
+          break;
+        }
+      }
+
+      if (e.detail.value === '1') {
+        this.inventory = this.dateInventory * 100;
+      } else if (e.detail.value === '2') {
+        this.inventory = this.sunInventory * 100;
+      } else if (e.detail.value == '0') {
+        this.inventory = '';
+      }
+      this.astrictDate.data.goodsStockFlag = e.detail.value;
+    },
+    // 单选可退模式
+    bookingChange(e) {
+      for (let i = 0; i < this.bookingList.length; i++) {
+        if (this.bookingList[i].id === e.target.value) {
+          this.bookingIndex = i;
+          break;
+        }
+      }
+      this.astrictDate.data.usubscribeRule = e.detail.value;
+    },
+    // 实名制
+    trueNmeChange(e) {
+      if (e.detail.value) {
+        this.astrictDate.data.isRealName = '0';
+      } else {
+        this.astrictDate.data.isRealName = '1';
+      }
+    },
+    // 显示二维码
+    codeShowChange(e) {
+      if (e.detail.value) {
+        this.astrictDate.data.isShowQrcode = '0';
+      } else {
+        this.astrictDate.data.isShowQrcode = '1';
+      }
+    },
+    // 获取单个商品信息
+    async getShopBuyId() {
+      this.loading = true;
+      if (!this.SHOPID) return;
+      await this.$http
+        .get('/goods/getById/' + this.SHOPID)
+        .then(async (res) => {
+          if (res.code === 200 && res.msg === 'OK') {
+            console.log(res);
+            this.shopData = res.data;
+
+            this.getShopList();
+
+            console.log(this.shopData);
+            setTimeout(() => {
+              // 判断返回的是否是自营商品
+              this.typeProperty = this.shopData.saleRule;
+              console.log(this.typeProperty);
+              this.price = this.shopData.salePrice ;
+              this.rateprice = this.shopData.price ;
+
+              if (this.shopData.expiredTime) {
+                this.expirationDate = this.shopData.expiredTime.slice(0, 10) ?  this.shopData.expiredTime.slice(0, 10) : '请选择过期日期';
+              }
+
+              let rule = JSON.parse(this.shopData.saleRuleJson);
+
+              if (rule) {
+                this.astrictDate.data.saleDay = rule.data.saleDay ? rule.data.saleDay : 0;
+                this.astrictDate.data.saleNum = rule.data.saleNum ? rule.data.saleNum : 0;
+                // 有效期模式
+                this.astrictDate.dateSetting = rule.data.dateSetting
+                this.patterIndex = +rule.data.dateSetting
+                // 库存模式
+                this.astrictDate.goodsStockFlag = rule.data.goodsStockFlag
+                this.shopNumIndex = +rule.data.goodsStockFlag
+                if (this.shopNumIndex === 1) {
+                  this.dateInventory = this.shopData.inventory
+                } else if (this.shopNumIndex === 2) {
+                  this.sunInventory = this.shopData.inventory
+                }
+                // 预订数量
+                this.astrictDate.data.bookRule = rule.data.bookRule
+                // 实名制
+                if (rule.data.isRealName === '0') {
+                  this.trueNme = true
+                } else {
+                  this.trueNme = false
+                }
+                this.astrictDate.data.isRealName = rule.data.isRealName
+                // 可退规则
+                this.bookingIndex = +rule.data.usubscribeRule
+                this.astrictDate.usubscribeRule = rule.data.usubscribeRule
+                // 二维码
+                if (rule.data.isShowQrcode === '0') {
+                  this.codeShow = true
+                } else {
+                  this.codeShow = false
+                }
+                this.astrictDate.data.isShowQrcode = rule.data.isShowQrcode
+
+              }
+              // 限制购票回显
+              if (this.shopData.saleRule === '1') {
+                this.showoperat = true;
+              } else {
+                this.showoperat = false;
+              }
 
-					this.getShopList();
+              // 图标回显
+              if (this.shopData.icon) {
+                this.iconurl = this.shopData.icon;
+              } else {
+                this.iconurl = '';
+              }
+              this.loading = false;
+            }, 500);
+          }
+        });
+    },
 
-					// 限制购票回显
-					if (this.shopData.saleRule === '1') {
-						let sale = JSON.parse(this.shopData.saleRuleJson);
-						this.showoperat = true;
-						this.num1 = sale.data.saleDay;
-						this.num2 = sale.data.saleNum;
-					} else {
-						this.showoperat = false;
-					}
+    // 初始化编辑器
+    onEditorReady() {
+      uni
+        .createSelectorQuery()
+        .select('#editor')
+        .context((res) => {
+          this.editorCtx = res.context;
+          this.editorCtx.setContents({
+            html: this.shopData.describ, //this.EditGoodsDetail.content为赋值内容。
+          });
+        })
+        .exec();
+    },
 
-					// 图标回显
-					if (this.shopData.icon) {
-						this.iconurl = this.shopData.icon;
-					} else {
-						this.iconurl = '';
-					}
-				}
-			});
-		},
+    // -----------------------------------------------------------------
 
-		// 初始化编辑器
-		onEditorReady() {
-			uni
-				.createSelectorQuery()
-				.select('#editor')
-				.context(res => {
-					this.editorCtx = res.context;
-					this.editorCtx.setContents({
-						html: this.shopData.describ //this.EditGoodsDetail.content为赋值内容。
-					});
-				})
-				.exec();
-		},
+    // 跳转到管理分类页面
+    toClassify() {
+      if (this.storeId) {
+        uni.setStorageSync('shopid', this.storeId);
+        this.$mRouter.push({ route: '/pages/shop/classify' });
+      } else {
+        this.$mHelper.toast('请选择所属店铺后再进行自定义分类管理');
+      }
+    },
+    // 选择店铺
+    changeStore(e) {
+      this.storeIndex = e.detail.value;
+      this.storeId = this.storeList[this.storeIndex].id;
+      this.typeProperty = this.storeList[this.storeIndex].type;
+      // 未选择商铺不能进行商铺类型选择
+      if (this.storeId != '') {
+        this.getType();
+        this.getLine(); // 判断是否有商品名称列表
+      }
+    },
+    // 选择商品类型
+    changeType(e) {
+      this.typeIndex = e.detail.value;
+      this.typeId = this.typeList[this.typeIndex].id;
+      if (this.typeId != '') {
+        this.getShopName();
+      }
+    },
+    // 商品名称选择
+    changeShop(e) {
+      this.shopIndex = e.detail.value;
+      this.shopId = this.shopList[this.shopIndex].id;
+    },
+    // 分类
+    changeClassify(e) {
+      this.lineIndex = e.detail.value;
+      this.lineId = this.lineList[this.lineIndex].id;
+    },
+    // 所属店铺
+    async getShopList() {
+      this.storeList = [{ name: '所属店铺', id: '', type: '' }];
+      await this.$http
+        .get('/shop/getList', {
+          mid: this.scenicId,
+        })
+        .then(async (res) => {
+          if (res.data) {
+            let arr = [];
+            res.data.forEach((element) => {
+              arr.push({
+                name: element.name,
+                id: element.id,
+                type: element.shopFrom,
+              });
+            });
+            this.storeList = this.storeList.concat(arr);
+            this.storeDisable = false;
+            // 所属店铺回显
+            if (this.shopData.shopId) {
+              this.storeDisable = true
+              this.storeList.forEach((item, index) => {
+                if (this.shopData.shopId === item.id) {
+                  this.storeIndex = index;
+                }
+              });
+              this.storeId = this.storeList[this.storeIndex].id;
+              // 商品类型回显
+              this.getType();
+              this.getLine();
+            }
+          }
+        });
+    },
+    // 商品类型
+    async getType() {
+      this.typeList = [{ name: '商品类型(请先选择所属店铺)', id: '' }];
+      this.$http
+        .get('/type/getTypeListByShopId', {
+          id: this.storeId,
+        })
+        .then((res) => {
+          let arr = [];
+          res.data[0].children.forEach((element) => {
+            arr.push({ name: element.name, id: element.id });
+          });
+          this.typeList = this.typeList.concat(arr);
+          this.typeDisabled = false;
 
-		// -----------------------------------------------------------------
+          // 商品类型回显
+          if (this.shopData.typeId) {
+            this.typeDisabled = true;
 
-		// 跳转到管理分类页面
-		toClassify() {
-			if (this.storeId) {
-				uni.setStorageSync('shopid', this.storeId);
-				this.$mRouter.push({ route: '/pages/shop/classify' });
-			} else {
-				this.$mHelper.toast('请选择所属店铺后再进行自定义分类管理');
-			}
-		},
-		// 选择店铺
-		changeStore(e) {
-			this.storeIndex = e.detail.value;
-			this.storeId = this.storeList[this.storeIndex].id;
-			this.typeProperty = this.storeList[this.storeIndex].type;
-			// 未选择商铺不能进行商铺类型选择
-			if (this.storeId != '') {
-				this.getType();
-				this.getLine(); // 判断是否有商品名称列表
-			}
-		},
-		// 选择商品类型
-		changeType(e) {
-			this.typeIndex = e.detail.value;
-			this.typeId = this.typeList[this.typeIndex].id;
-			if (this.typeId != '') {
-				this.getShopName();
-			}
-		},
-		// 商品名称选择
-		changeShop(e) {
-			this.shopIndex = e.detail.value;
-			this.shopId = this.shopList[this.shopIndex].id;
-		},
-		// 分类
-		changeClassify(e) {
-			this.lineIndex = e.detail.value;
-			this.lineId = this.lineList[this.lineIndex].id;
-		},
-		// 所属店铺
-		async getShopList() {
-			this.storeList = [{ name: '所属店铺', id: '', type: '' }];
-			await this.$http
-				.get('/shop/getList', {
-					mid: this.scenicId
-				})
-				.then(async res => {
-					if (res.data) {
-						console.log(res);
-						let arr = [];
-						res.data.forEach(element => {
-							arr.push({
-								name: element.name,
-								id: element.id,
-								type: element.shopFrom
-							});
-						});
-						this.storeList = this.storeList.concat(arr);
-						this.storeDisable = false;
-						// 所属店铺回显
-						if (this.shopData.shopId) {
-							this.storeList.forEach((item, index) => {
-								if (this.shopData.shopId === item.id) {
-									this.storeIndex = index;
-								}
-							});
-							this.storeId = this.storeList[this.storeIndex].id;
-							// 商品类型回显
-							this.getType();
-							this.getLine();
-						}
-					}
-				});
-		},
-		// 商品类型
-		async getType() {
-			this.typeList = [{ name: '商品类型(请先选择所属店铺)', id: '' }];
-			this.$http
-				.get('/type/getTypeListByShopId', {
-					id: this.storeId
-				})
-				.then(res => {
-					let arr = [];
-					res.data[0].children.forEach(element => {
-						arr.push({ name: element.name, id: element.id });
-					});
-					this.typeList = this.typeList.concat(arr);
-					this.typeDisabled = false;
+            this.typeList.forEach((item, index) => {
+              if (this.shopData.typeId === item.id) {
+                this.typeIndex = index;
+              }
+            });
+            this.typeId = this.typeList[this.typeIndex].id;
+            this.shopname = this.shopData.name;
+          }
+        });
+    },
+    // 商品名称
+    async getShopName() {
+      this.shopList = [{ name: '商品名称(请先选择商品类型)', id: '' }];
+      await this.$http
+        .get('/goods/getTicketGoods', {
+          typeId: this.typeId,
+          shopId: this.storeId,
+        })
+        .then(async (res) => {
+          let arr = [];
+          res.data.forEach((element) => {
+            arr.push({ name: element.ticket_name, id: element.ticket_no });
+          });
+          this.shopList = this.shopList.concat(arr);
+        });
+    },
+    // 线路分配
+    async getLine() {
+      await this.$http
+        .get('/goods/getCustomGroupList', {
+          shopId: this.storeId,
+        })
+        .then(async (res) => {
+          let arr = [];
+          this.hasNameList = +res.data.shopFrom;
+          res.data.customGroupList.forEach((element) => {
+            arr.push({ name: element.name, id: element.id });
+          });
+          this.lineList = this.lineList.concat(arr);
+          this.lineDidsable = false;
 
-					// 商品类型回显
-					if (this.shopData.typeId) {
-						this.typeList.forEach((item, index) => {
-							if (this.shopData.typeId === item.id) {
-								this.typeIndex = index;
-							}
-						});
-						this.typeId = this.typeList[this.typeIndex].id;
-						this.shopname = this.shopData.name;
-					}
-				});
-		},
-		// 商品名称
-		async getShopName() {
-			this.shopList = [{ name: '商品名称(请先选择商品类型)', id: '' }];
-			await this.$http
-				.get('/goods/getTicketGoods', {
-					typeId: this.typeId,
-					shopId: this.storeId
-				})
-				.then(async res => {
-					let arr = [];
-					res.data.forEach(element => {
-						arr.push({ name: element.ticket_name, id: element.ticket_no });
-					});
-					this.shopList = this.shopList.concat(arr);
-				});
-		},
-		// 线路分配
-		async getLine() {
-			await this.$http
-				.get('/goods/getCustomGroupList', {
-					shopId: this.storeId
-				})
-				.then(async res => {
-					let arr = [];
-					this.hasNameList = +res.data.shopFrom;
-					res.data.customGroupList.forEach(element => {
-						arr.push({ name: element.name, id: element.id });
-					});
-					this.lineList = this.lineList.concat(arr);
-					this.lineDidsable = false;
+          // 可选择商品名称回显
+          if (this.shopData.name) {
+            this.getShopName();
+            this.shopList.forEach((item, index) => {
+              if (this.shopData.name === item.name) {
+                this.shopIndex = index;
+              } else {
+                this.shopIndex = 0;
+              }
+            });
+            this.shopId = this.shopList[this.shopIndex].id;
+          }
 
-					// 可选择商品名称回显
-					if (this.shopData.name) {
-						this.getShopName();
-						this.shopList.forEach((item, index) => {
-							if (this.shopData.name === item.name) {
-								this.shopIndex = index;
-							} else {
-								this.shopIndex = 0;
-							}
-						});
-						this.shopId = this.shopList[this.shopIndex].id;
-					}
+          // 分类回显
+          if (this.shopData.customGroupId) {
+            this.lineList.forEach((item, index) => {
+              if (this.shopData.customGroupId === item.id) {
+                this.lineIndex = index;
+              }
+            });
+            this.lineId = this.lineList[this.lineIndex].id;
+          }
+        });
+    },
+    // 账号限制
+    Change(e) {
+      this.showoperat = e.detail.value;
+    },
+    subtractUser() {
+      if (this.astrictDate.data.saleDay <= 1) {
+        this.$mHelper.toast('最少一天');
+        return;
+      } else {
+        this.astrictDate.data.saleDay--;
+      }
+    },
+    addUser() {
+      this.astrictDate.data.saleDay++;
+    },
+    subtractDate() {
+      if (this.astrictDate.data.saleNum <= 1) {
+        this.$mHelper.toast('最少一张票');
+        return;
+      } else {
+        this.astrictDate.data.saleNum--;
+      }
+    },
+    addDate() {
+      this.astrictDate.data.saleNum++;
+    },
+    // 图标上传
+    uploadImg() {
+      let _self = this;
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album'], // camera 使用相机   album 从相册中选
+        success: function (res) {
+          // 成功则返回图片的本地文件路径列表 tempFilePaths
+          _self.iconurl = res.tempFilePaths[0];
+          myCloud.uploadFile({
+            url: 'http://192.168.100.135:83/merch/common/upload/oss',
+            filePath: _self.iconurl, // 要上传的文件对象
+            cloudPath: _self.iconurl, // 要上传的文件对象
+            name: 'file',
+            success: (res) => {
+              if (res.fileID) {
+                _self.Icon = res.fileID;
+              }
+            },
+            onUploadProgress: function (progressEvent) {
+              _self.progress = Math.round(
+                (progressEvent.loaded * 100) / progressEvent.total
+              );
+            },
+          });
+        },
+      });
+    },
+    // 图册上传
+    uploadList() {
+      let _self = this;
+      uni.chooseImage({
+        count: 6,
+        sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album'], // camera 使用相机   album 从相册中选
+        success: function (res) {
+          // 成功则返回图片的本地文件路径列表 tempFilePaths
+          let img = [];
+          img.push(res.tempFilePaths);
+          if (_self.pickList.length >= 6) {
+            _self.$mHelper.toast('最多只可上传6张图片');
+          } else {
+            _self.pickList = _self.pickList.concat(img);
+            // for (let i = 0; i < _self.pickList.length; i++) {
+            //   let element = _self.pickList[i];
+            //   myCloud.uploadFile({
+            //     url: 'http://192.168.100.135:83/merch/common/upload/oss',
+            //     filePath: element, // 要上传的文件对象
+            //     cloudPath: element,
+            //     name: 'file',
+            //     onUploadProgress: function (progressEvent) {
+            //       // 上传进度回调
+            //       let percentCompleted = Math.round(
+            //         (progressEvent.loaded * 100) / progressEvent.total
+            //       );
+            //     },
+            //     success: (res) => {
+            //     },
+            //   });
+            // }
+          }
+        },
+      });
+    },
+    // 删除图册中的图片
+    deleteThisImg(index) {
+      this.pickList.splice(index, 1);
+    },
+    // 富文本失去焦点保存内容
+    saveTxt(e) {
+      this.mastKnow = e.detail.html;
+    },
+    // 内容提交
+    submitMesage() {
+      let _this = this;
+      this.loading = true;
+      // 判断是否限制账号购买
+      if (this.showoperat) {
+        this.showoperat = '1';
+      } else {
+        this.showoperat = '0';
+        this.astrictDate.data.saleDay = 0;
+        this.astrictDate.data.saleNum = 0;
+      }
+      // 判断是否可以自定义商品名称
+      let name = '';
+      if (this.shopList.length === 1) {
+        name = this.shopname;
+      } else {
+        name = this.shopList[this.shopIndex].id;
+      }
+      if (!this.storeId) {
+        this.$mHelper.toast('请选择所属商铺');
+        this.loading = false;
+        return;
+      }
+      if (!this.typeId) {
+        this.$mHelper.toast('请选择商品类型');
+        this.loading = false;
+        return;
+      }
 
-					// 分类回显
-					if (this.shopData.customGroupId) {
-						this.lineList.forEach((item, index) => {
-							if (this.shopData.customGroupId === item.id) {
-								this.lineIndex = index;
-							}
-						});
-						this.lineId = this.lineList[this.lineIndex].id;
-					}
-				});
-		},
-		// 账号限制
-		Change(e) {
-			this.showoperat = e.detail.value;
-		},
-		subtractUser() {
-			if (this.num1 <= 1) {
-				this.$mHelper.toast('最少一天');
-				return;
-			} else {
-				this.num1--;
-			}
-		},
-		addUser() {
-			this.num1++;
-		},
-		subtractDate() {
-			if (this.num2 <= 1) {
-				this.$mHelper.toast('最少一张票');
-				return;
-			} else {
-				this.num2--;
-			}
-		},
-		addDate() {
-			this.num2++;
-		},
-		// 图标上传
-		uploadImg() {
-			let _self = this;
-			uni.chooseImage({
-				count: 1,
-				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-				sourceType: ['album'], // camera 使用相机   album 从相册中选
-				success: function(res) {
-					// 成功则返回图片的本地文件路径列表 tempFilePaths
-					_self.iconurl = res.tempFilePaths[0];
-					myCloud.uploadFile({
-						url: 'http://192.168.100.135:83/merch/common/upload/oss',
-						filePath: _self.iconurl, // 要上传的文件对象
-						cloudPath: _self.iconurl, // 要上传的文件对象
-						name: 'file',
-						success: res => {
-							if (res.fileID) {
-								_self.Icon = res.fileID;
-							}
-						},
-						onUploadProgress: function(progressEvent) {
-							_self.progress = Math.round(
-								(progressEvent.loaded * 100) / progressEvent.total
-							);
-						}
-					});
-				}
-			});
-		},
-		// 图册上传
-		uploadList() {
-			let _self = this;
-			uni.chooseImage({
-				count: 6,
-				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-				sourceType: ['album'], // camera 使用相机   album 从相册中选
-				success: function(res) {
-					// 成功则返回图片的本地文件路径列表 tempFilePaths
-					let img = [];
-					img.push(res.tempFilePaths);
-					if (_self.pickList.length >= 6) {
-						_self.$mHelper.toast('最多只可上传6张图片');
-					} else {
-						_self.pickList = _self.pickList.concat(img);
-						// for (let i = 0; i < _self.pickList.length; i++) {
-						//   let element = _self.pickList[i];
-						//   myCloud.uploadFile({
-						//     url: 'http://192.168.100.135:83/merch/common/upload/oss',
-						//     filePath: element, // 要上传的文件对象
-						//     cloudPath: element,
-						//     name: 'file',
-						//     onUploadProgress: function (progressEvent) {
-						//       // 上传进度回调
-						//       let percentCompleted = Math.round(
-						//         (progressEvent.loaded * 100) / progressEvent.total
-						//       );
-						//     },
-						//     success: (res) => {
-						//     },
-						//   });
-						// }
-					}
-				}
-			});
-		},
-		// 删除图册中的图片
-		deleteThisImg(index) {
-			this.pickList.splice(index, 1);
-		},
-		// 富文本失去焦点保存内容
-		saveTxt(e) {
-			this.mastKnow = e.detail.html;
-		},
-		// 内容提交
-		submitMesage() {
-			let _this = this;
-			this.loading = true;
-			let astrictDate = {};
-			// 判断是否限制账号购买
-			if (this.showoperat) {
-				this.showoperat = '1';
-				astrictDate = {
-					data: {
-						saleDay: this.num1,
-						saleNum: this.num2
-					}
-				};
-			} else {
-				this.showoperat = '0';
-				astrictDate = '';
-			}
-			// 判断是否可以自定义商品名称
-			let name = '';
-			if (this.shopList.length === 1) {
-				name = this.shopname;
-			} else {
-				name = this.shopList[this.shopIndex].id;
-			}
-			if (!this.storeId) {
-				this.$mHelper.toast('请选择所属商铺');
-				this.loading = false;
-				return;
-			}
-			if (!this.typeId) {
-				this.$mHelper.toast('请选择商品类型');
-				this.loading = false;
-				return;
-			}
-			if (!name) {
-				this.$mHelper.toast('请选择商品名称或者输入商品名称');
-				this.loading = false;
-				return;
-			}
+      if (!name) {
+        this.$mHelper.toast('请选择商品名称或者输入商品名称');
+        this.loading = false;
+        return;
+      }
+      
+      // if (this.typeProperty === '1') {  // 分销
+      //   this.astrictDate.data.dateSetting = ''
+      //   this.astrictDate.data.goodsStockFlag = ''
+      //   this.astrictDate.data.bookRule = ''
+      //   this.astrictDate.data.usubscribeRule = ''
+      //   this.astrictDate.data.isRealName = ''
+      //   this.astrictDate.data.isShowQrcode = ''
+      // }
 
-			this.$http
-				.post('/goods/add', {
-					id: this.shopData.id || '',
-					mid: this.scenicId,
-					shopId: this.storeId,
-					typeId: this.typeId,
-					name: name,
-					customGroupId: this.lineId,
-					saleRule: this.showoperat,
-					saleRuleJson: JSON.stringify(astrictDate),
-					describ: this.mastKnow,
-					icon: this.Icon || '',
-					del: this.shopData.del || '',
-					upDown: this.shopData.upDown || ''
-				})
-				.then(res => {
-					if (res.code === 200 && res.msg === 'OK') {
-						if (this.shopData.id) {
-							this.$mHelper.toast('保存成功,请联系管理员进行审核');
-						} else {
-							this.$mHelper.toast('添加成功');
-						}
-						this.loading = false;
-						setTimeout(() => {
-							this.$mRouter.back();
-						}, 500);
-					}
-				});
-		}
-	}
+      this.$http
+        .post('/goods/add', {
+          id: this.shopData.id || '',
+          mid: this.scenicId,
+          shopId: this.storeId,
+          typeId: this.typeId,
+          customGroupId: this.lineId,
+          describ: this.mastKnow,
+          icon: this.Icon || '',
+          del: this.shopData.del || '',
+          upDown: this.shopData.upDown || '',
+          saleRule: this.showoperat, // 限制购票
+          saleRuleJson: JSON.stringify(this.astrictDate),
+          //  自营
+          name: name,
+          salePrice: this.price || '',
+          price: this.rateprice || '',
+          expiredTime: this.expirationDate === '商品过期日期' ? '' : this.expirationDate,
+          inventory: this.inventory,
+        })
+        .then((res) => {
+          if (res.code === 200 && res.msg === 'OK') {
+            this.loading = false;
+            if (this.shopData.id) {
+              this.$mHelper.toast('保存成功,请联系管理员进行审核');
+            } else {
+              this.$mHelper.toast('添加成功');
+            }
+            setTimeout(() => {
+              this.$mRouter.back();
+            }, 500);
+          }
+        });
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .shopdetail {
-	.shopdetail-content {
-		padding: 24upx 0 0upx;
-		.detail-list {
-			padding: 0 33upx;
-			background-color: #ffffff;
-			border-bottom: 1px solid #e7e7e7;
-			box-sizing: border-box;
-			.menu {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 93upx;
-				.uni-list-cell {
-					width: 100%;
-					display: flex;
-					align-items: center;
-					height: 93upx;
-					.uni-list-cell-db {
-						height: 100%;
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						.selectlist {
-							width: 100%;
-						}
-					}
-				}
-				.title {
-					font-size: 28upx;
-					color: #232828;
-				}
-				.more {
-					width: 15upx;
-					height: 26upx;
-				}
-				.bigtitle {
-					font-size: 34upx;
-					color: #232828;
-					font-weight: 700;
-				}
-				.input-shopname {
-					width: 100%;
-					height: 100%;
-				}
-				.txt {
-					color: #a95cff;
-					font-weight: 700;
-				}
-				.linetitle {
-					color: #232828;
-				}
-				.astricttitle {
-					font-weight: 700;
-					font-size: 32upx;
-					color: #232828;
-				}
-			}
-		}
-		.noborder {
-			border-bottom: none;
-		}
-		.classify {
-			background-color: #f9f9f9;
-		}
-		.idastrict {
-			background-color: #fff;
-		}
-		.operat {
-			background-color: #f9f9f9;
-			.menu {
-				.title {
-					font-size: 28upx;
-					color: #232828;
-				}
-				.sub,
-				.add {
-					width: 44upx;
-					height: 44upx;
-					border-radius: 50%;
-					border: 1px solid #b4b8b7;
-					color: #b4b8b7;
-					text-align: center;
-					line-height: 40upx;
-					font-weight: 700;
-				}
-				.txt {
-					color: #232828;
-					font-weight: normal;
-				}
-				.unit {
-					color: #232828;
-				}
-			}
-		}
-		.shopicon {
-			height: 100upx;
-			padding: 0 33upx;
-			font-size: 32upx;
-			color: #232828;
-			font-weight: 700;
-			line-height: 100upx;
-		}
-		.iconcontent {
-			padding: 25upx 33upx;
-			background-color: #f9f9f9;
-			display: flex;
-			align-items: center;
-			.icon {
-				display: inline-block;
-				height: 56upx;
-				font-size: 28upx;
-				color: #a3a8a8;
-				border-radius: 50%;
-				margin-left: 20upx;
-				border: 1px dashed #ccc;
-				border-radius: 5%;
-				text-align: center;
-				line-height: 56upx;
-				padding: 0 15upx;
-			}
-			.shopLogo {
-				width: 56upx;
-				height: 56upx;
-				border-radius: 50%;
-			}
-			.per {
-				margin-left: 50upx;
-				color: #a3a8a8;
-			}
-		}
-		.uploading {
-			padding: 25upx 33upx;
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			background-color: #fff;
-			.item-warp {
-				border-radius: 17upx;
-				margin-right: 15upx;
-				margin-bottom: 15upx;
-				box-sizing: border-box;
-				overflow: hidden;
-				.img-warp {
-					position: relative;
-				}
-				.item {
-					width: 160upx;
-					height: 160upx;
-				}
-				&:nth-child(4) {
-					margin-right: 0;
-				}
-				.delete {
-					position: absolute;
-					right: -35upx;
-					top: -35upx;
-					width: 70upx;
-					height: 70upx;
-					border-radius: 50%;
-					background-color: #8064f7;
-					.delete-icon {
-						position: absolute;
-						left: 13upx;
-						bottom: 13upx;
-						width: 14upx;
-						height: 14upx;
-					}
-				}
-			}
-		}
-		.know {
-			padding: 24upx 33upx;
-			background-color: #fff;
-			#editor {
-				width: 100%;
-				height: 300px;
-			}
-		}
-		.btn {
-			width: 100%;
-			height: 98upx;
-			color: #ffffff;
-			font-size: 32upx;
-			text-align: center;
-			line-height: 98upx;
-			background-color: #8064f7;
-			margin-top: 27upx;
-			letter-spacing: 2upx;
-		}
-		.price-warp {
-			padding: 0 33upx;
-			background-color: #ffffff;
-			border-bottom: 1px solid #e7e7e7;
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			height: 93upx;
-			.name {
-				font-size: 28upx;
-				color: #232828;
-			}
-			.price {
-				flex: 1;
-			}
-		}
-		.property {
-			.property-warp {
-				.title {
-					padding: 20upx 33upx;
-					font-size: 34rpx;
-					color: #232828;
-					font-weight: 700;
-				}
-				.date {
-					padding: 0 33upx;
-					display: flex;
-					align-items: center;
-					border-bottom: 1px solid #e7e7e7;
-					background-color: #fff;
-					height: 93upx;
-					.namebar {
-						font-size: 28upx;
-						line-height: 93upx;
-						color: #232828;
-					}
-					.num {
-						flex: 1;
-						height: 100%;
-						line-height: 93upx;
-					}
-				}
-			}
-		}
-		.pattern {
-			.pattern-item {
-				display: flex;
-				border-bottom: 1px solid #e7e7e7;
+  .shopdetail-content {
+    padding: 24upx 0 0upx;
+    .detail-list {
+      padding: 0 33upx;
+      background-color: #ffffff;
+      border-bottom: 1px solid #e7e7e7;
+      box-sizing: border-box;
+      .menu {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 93upx;
+        .uni-list-cell {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          height: 93upx;
+          .uni-list-cell-db {
+            height: 100%;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .selectlist {
+              width: 100%;
+            }
+          }
+        }
+        .title {
+          font-size: 28upx;
+          color: #232828;
+        }
+        .more {
+          width: 15upx;
+          height: 26upx;
+        }
+        .bigtitle {
+          font-size: 34upx;
+          color: #232828;
+          font-weight: 700;
+        }
+        .input-shopname {
+          width: 100%;
+          height: 100%;
+        }
+        .txt {
+          color: #a95cff;
+          font-weight: 700;
+        }
+        .linetitle {
+          color: #232828;
+        }
+        .astricttitle {
+          font-weight: 700;
+          font-size: 32upx;
+          color: #232828;
+        }
+      }
+    }
+    .noborder {
+      border-bottom: none;
+    }
+    .classify {
+      background-color: #f9f9f9;
+    }
+    .idastrict {
+      background-color: #fff;
+    }
+    .operat {
+      background-color: #f9f9f9;
+      .menu {
+        .title {
+          font-size: 28upx;
+          color: #232828;
+        }
+        .sub,
+        .add {
+          width: 44upx;
+          height: 44upx;
+          border-radius: 50%;
+          border: 1px solid #b4b8b7;
+          color: #b4b8b7;
+          text-align: center;
+          line-height: 40upx;
+          font-weight: 700;
+        }
+        .txt {
+          color: #232828;
+          font-weight: normal;
+        }
+        .unit {
+          color: #232828;
+        }
+      }
+    }
+    .shopicon {
+      height: 100upx;
+      padding: 0 33upx;
+      font-size: 32upx;
+      color: #232828;
+      font-weight: 700;
+      line-height: 100upx;
+    }
+    .iconcontent {
+      padding: 25upx 33upx;
+      background-color: #f9f9f9;
+      display: flex;
+      align-items: center;
+      .icon {
+        display: inline-block;
+        height: 56upx;
+        font-size: 28upx;
+        color: #a3a8a8;
+        border-radius: 50%;
+        margin-left: 20upx;
+        border: 1px dashed #ccc;
+        border-radius: 5%;
+        text-align: center;
+        line-height: 56upx;
+        padding: 0 15upx;
+      }
+      .shopLogo {
+        width: 56upx;
+        height: 56upx;
+        border-radius: 50%;
+      }
+      .per {
+        margin-left: 50upx;
+        color: #a3a8a8;
+      }
+    }
+    .uploading {
+      padding: 25upx 33upx;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background-color: #fff;
+      .item-warp {
+        border-radius: 17upx;
+        margin-right: 15upx;
+        margin-bottom: 15upx;
+        box-sizing: border-box;
+        overflow: hidden;
+        .img-warp {
+          position: relative;
+        }
+        .item {
+          width: 160upx;
+          height: 160upx;
+        }
+        &:nth-child(4) {
+          margin-right: 0;
+        }
+        .delete {
+          position: absolute;
+          right: -35upx;
+          top: -35upx;
+          width: 70upx;
+          height: 70upx;
+          border-radius: 50%;
+          background-color: #8064f7;
+          .delete-icon {
+            position: absolute;
+            left: 13upx;
+            bottom: 13upx;
+            width: 14upx;
+            height: 14upx;
+          }
+        }
+      }
+    }
+    .know {
+      padding: 24upx 33upx;
+      background-color: #fff;
+      #editor {
+        width: 100%;
+        height: 300px;
+      }
+    }
+    .btn {
+      width: 100%;
+      height: 98upx;
+      color: #ffffff;
+      font-size: 32upx;
+      text-align: center;
+      line-height: 98upx;
+      background-color: #8064f7;
+      margin-top: 27upx;
+      letter-spacing: 2upx;
+    }
+    .price-warp {
+      padding: 0 33upx;
+      background-color: #ffffff;
+      border-bottom: 1px solid #e7e7e7;
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      height: 93upx;
+      .name {
+        font-size: 28upx;
+        color: #232828;
+      }
+      .price {
+        flex: 1;
+      }
+    }
+    .property {
+      .property-warp {
+        .title {
+          padding: 20upx 33upx;
+          font-size: 34rpx;
+          color: #232828;
+          font-weight: 700;
+        }
+        .date {
+          padding: 0 33upx;
+          display: flex;
+          align-items: center;
+          border-bottom: 1px solid #e7e7e7;
+          background-color: #fff;
+          height: 93upx;
+          .namebar {
+            font-size: 28upx;
+            line-height: 93upx;
+            color: #232828;
+          }
+          .num {
+            flex: 1;
+            height: 100%;
+            line-height: 93upx;
+          }
+        }
+      }
+    }
+    .pattern {
+      .pattern-item {
+        display: flex;
+        border-bottom: 1px solid #e7e7e7;
 
-				.checkth {
-					width: 100upx;
-				}
-				.txt {
-					flex: 1;
-					display: flex;
-					justify-content: center;
-					flex-direction: column;
-					color: #a3a8a8;
-					.txt1 {
-						color: #232828;
-						font-weight: 700;
-					}
-					.inventory {
-						display: flex;
-						align-items: center;
-						.name {
-							width: 150upx;
-							color: #232828;
-						}
-						.dateInventory {
-							flex: 1;
-						}
-					}
-				}
-			}
-		}
-		.booking {
-			.booking-warp {
-				.title {
-					padding: 20upx 33upx;
-					font-size: 34rpx;
-					color: #232828;
-					font-weight: 700;
-				}
-				.model {
-					padding: 20upx 33upx;
-					background-color: #fff;
-					border-bottom: 1px solid #e7e7e7;
-					.inputnum {
-						display: flex;
-						align-items: center;
-						.bar {
-							width: 150upx;
-							font-size: 28upx;
-							font-weight: 700;
-							color: #232828;
-						}
-						.bookingnum {
-							flex: 1;
-						}
-					}
-					.txt {
-						margin-top: 28upx;
-						color: #a3a8a8;
-					}
-				}
-				.truename {
-					.truename-warp {
-						padding: 20upx 33upx;
-						display: flex;
-						justify-content: space-between;
-						border-bottom: 1px solid #e7e7e7;
-						background-color: #fff;
-					}
-				}
-				.modeltwo {
-					.booking-item {
-						display: flex;
-						border-bottom: 1px solid #e7e7e7;
-						.checkth {
-							width: 100upx;
-						}
-						.txt {
-							flex: 1;
-						}
-					}
-				}
-			}
-		}
-	}
+        .checkth {
+          width: 100upx;
+        }
+        .txt {
+          flex: 1;
+          display: flex;
+          justify-content: center;
+          flex-direction: column;
+          color: #a3a8a8;
+          .txt1 {
+            color: #232828;
+            font-weight: 700;
+          }
+          .inventory {
+            display: flex;
+            align-items: center;
+            .name {
+              width: 150upx;
+              color: #232828;
+            }
+            .dateInventory {
+              flex: 1;
+            }
+          }
+        }
+      }
+    }
+    .booking {
+      .booking-warp {
+        .title {
+          padding: 20upx 33upx;
+          font-size: 34rpx;
+          color: #232828;
+          font-weight: 700;
+        }
+        .model {
+          padding: 20upx 33upx;
+          background-color: #fff;
+          border-bottom: 1px solid #e7e7e7;
+          .inputnum {
+            display: flex;
+            align-items: center;
+            .bar {
+              width: 150upx;
+              font-size: 28upx;
+              font-weight: 700;
+              color: #232828;
+            }
+            .bookingnum {
+              flex: 1;
+            }
+          }
+          .txt {
+            margin-top: 28upx;
+            color: #a3a8a8;
+          }
+        }
+        .truename {
+          .truename-warp {
+            padding: 20upx 33upx;
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #e7e7e7;
+            background-color: #fff;
+          }
+        }
+        .modeltwo {
+          .booking-item {
+            display: flex;
+            border-bottom: 1px solid #e7e7e7;
+            .checkth {
+              width: 100upx;
+            }
+            .txt {
+              flex: 1;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 </style>