update

src/view/good-mgr/add-good/index.vue

@@ -1020,15 +1020,12 @@ export default {
         form.video = deciptInfo.videoList[0];
         form.videoPoster = getPosterFromVideoUrl(form.video);
       }
-<<<<<<< HEAD
-=======
       if(deciptInfo.threeDUrl&&deciptInfo.threeDUrl.length>0){
         form.threeDUrl=deciptInfo.threeDUrl[0]
       }else{
         form.threeDUrl=''
       }
       
->>>>>>> master
       // console.log('form',form)
       // 快递模板
       // if (!templateId) {
@@ -1315,10 +1312,6 @@ export default {
           item.commodityPassId = this.form.saleInfo.id;
         });
       }
-<<<<<<< HEAD
-      console.log("111111", form.skuList);
-=======
->>>>>>> master
       this.draftLoading = true;
       this.api({
         apiName: "draftGood",

src/view/good-mgr/add-good/sale-info.vue

@@ -3,35 +3,18 @@
     <div class="item">
       <label class="label">销售模式：</label>
       <RadioGroup v-model="data.salesType" @on-change="changeSalesType">
-<<<<<<< HEAD
-        <Radio :label="1" style="width: 200px" :disabled="isDetail || isEdit|| isDraft|| isAgain"
-=======
         <Radio :label="1" style="width: 200px" :disabled="isDetail || isEdit|| isAgain"
->>>>>>> master
           >普通</Radio
         >
         <Radio
           :label="2"
           style="width: 200px"
-<<<<<<< HEAD
-          :disabled="isDetail|| isEdit|| isDraft|| isAgain  || packType"
-=======
           :disabled="isDetail|| isEdit|| isAgain  || packType"
->>>>>>> master
           >预售</Radio
         >
         <Radio
           :label="3"
           style="width: 200px"
-<<<<<<< HEAD
-          :disabled="isDetail || isEdit|| isDraft|| isAgain || packType"
-          >拍卖</Radio
-        >
-        <Radio :label="4" style="width: 200px" :disabled="isDetail || isEdit|| isDraft|| isAgain "
-          >盲盒</Radio
-        >
-        <Radio :label="5" style="width: 200px" :disabled="isDetail || isEdit|| isDraft|| isAgain"
-=======
           :disabled="isDetail || isEdit|| isAgain || packType"
           >拍卖</Radio
         >
@@ -39,24 +22,13 @@
           >盲盒</Radio
         >
         <Radio :label="5" style="width: 200px" :disabled="isDetail || isEdit|| isAgain"
->>>>>>> master
           >免费领取</Radio
         >
       </RadioGroup>
     </div>
     <div class="item" v-if="shopStatus != 4">
       <label class="label">限购数量：</label>
-<<<<<<< HEAD
-      <Input
-        v-model.number="data.purchaseLimit"
-        type="number"
-        :disabled="isDetail"
-        placeholder="请输入限购数量"
-        style="width: 400px"
-      />
-=======
        <InputNumber :min="0" style="width: 400px" :disabled="isDetail" placeholder="请输入限购数量"  v-model.number="data.purchaseLimit"></InputNumber>
->>>>>>> master
     </div>
     <div class="item" v-if="data.salesType == 2 && shopStatus != 3">
       <label class="label">预售时间：</label>
@@ -414,17 +386,10 @@
       <label class="label">商品通证：</label>
       <RadioGroup v-model="data.commodityPass">
         <!-- <Radio :label="0" style="width:200px" :disabled="isDetail ">否</Radio> -->
-<<<<<<< HEAD
-        <Radio :label="1" style="width: 200px" :disabled="isDetail || isEdit|| isDraft|| isAgain"
-          >内部生成</Radio
-        >
-        <Radio :label="2" style="width: 200px" :disabled="isDetail || isEdit|| isDraft|| isAgain"
-=======
         <Radio :label="1" style="width: 200px" :disabled="isDetail || isEdit|| isAgain"
           >内部生成</Radio
         >
         <Radio :label="2" style="width: 200px" :disabled="isDetail || isEdit|| isAgain"
->>>>>>> master
           >外部绑定</Radio
         >
       </RadioGroup>
@@ -440,11 +405,7 @@
         class="search-input"
         v-model="data.id"
         @on-change="getMoreOutParams(data.id)"
-<<<<<<< HEAD
-        :disabled="isDetail || isEdit|| isDraft|| isAgain"
-=======
         :disabled="isDetail || isEdit|| isAgain"
->>>>>>> master
         style="width: 400px"
       >
         <Option
@@ -531,11 +492,7 @@
           />
         </template>
         <template slot-scope="{ row, index }" slot="coinName">
-<<<<<<< HEAD
-          <template v-if="isDetail || isEdit|| isDraft|| isAgain">
-=======
           <template v-if="isDetail || isEdit|| isAgain">
->>>>>>> master
             <label class="coinName-label">{{ row.coinName || "--" }}</label>
           </template>
           <template v-else>
@@ -647,26 +604,10 @@
           </template>
           <template slot-scope="{ row, index }" slot="stock">
             <span v-if="isDetail">{{ row.stock }}</span>
-<<<<<<< HEAD
-            <Input
-              v-else
-              placeholder="整数值"
-              :value="row.stock"
-              @on-change="handleInputChange(index, 'stock')"
-              @on-blur="onBlur(index, row)"
-              type="number"
-              :readonly="isDetail || data.commodityPass==2"
-              :maxlength="9"
-            />
-          </template>
-          <template slot-scope="{ row, index }" slot="coinName">
-            <template v-if="isDetail || isEdit|| isDraft|| isAgain || data.sku[index].status == 1">
-=======
             <InputNumber  placeholder="整数值"  v-else :max="20000" :min="1" v-model="row.stock"  @on-change="handleInputChange(index, 'stock')" @on-blur="onBlur(index, row)" :readonly="isDetail"></InputNumber>
           </template>
           <template slot-scope="{ row, index }" slot="coinName">
             <template v-if="isDetail || isEdit|| isAgain || data.sku[index].status == 1">
->>>>>>> master
               <label class="coinName-label">{{ row.coinName || "--" }}</label>
             </template>
             <template v-else>
@@ -684,11 +625,7 @@
                   @on-change="handleInputChange(index, 'coinName')"
                   @on-blur="handleInputBlur(index, 'coinName')"
                   style="width: 140px"
-<<<<<<< HEAD
-                  :readonly="isDetail || isEdit|| isDraft|| isAgain || isAgain "
-=======
                   :readonly="isDetail || isEdit|| isAgain || isAgain "
->>>>>>> master
                   :disabled="isDetail || data.sku[index].status == 1"
                   :maxlength="10"
                 />
@@ -722,11 +659,7 @@
           />
         </template>
           <template slot-scope="{ row, index }" slot="isHide">
-<<<<<<< HEAD
-            <span v-if="isDetail|| isEdit|| isDraft|| isAgain">{{ row.isHide ? "是" : "否" }}</span>
-=======
             <span v-if="isDetail|| isEdit|| isAgain">{{ row.isHide ? "是" : "否" }}</span>
->>>>>>> master
             <Checkbox
               v-else
               v-model="row.isHide"
@@ -1143,26 +1076,6 @@ export default {
           }
         }
       }
-<<<<<<< HEAD
-    },
-    getMoreParams(val, index) {
-      let item = this.seriesList.find((x) => {
-        return x.commodityPassId === val;
-      });
-      this.tokenNumber = item.availableNumber;
-      this.data.sku[index].stock = Number(item.availableNumber).toFixed();
-      console.log("item", item);
-      this.data.sku[index].hash = item.hash;
-      console.log("item", item.hash);
-    },
-    getMoreOutParams(val) {
-      let item = this.seriesList.find((x) => {
-        return x.commodityPassId === val;
-      });
-      this.data.id = val;
-      this.data.outStock = Number(item.availableNumber).toFixed();
-    },
-=======
     },
     getMoreParams(val, index) {
       let item = this.seriesList.find((x) => {
@@ -1181,7 +1094,6 @@ export default {
       this.data.id = val;
       this.data.outStock = Number(item.availableNumber).toFixed();
     },
->>>>>>> master
     stockBlur(val) {
       let skuNumber = this.data.resource;
       skuNumber.forEach((item, index) => {
@@ -1393,13 +1305,6 @@ export default {
     },
     genColumn() {
       let columns = [];
-<<<<<<< HEAD
-      this.propList.forEach((pItem) => {
-        columns.push({
-          title: pItem.name,
-          minWidth: 120,
-          key: pItem.name,
-=======
       this.propList.forEach((pItem) => {
         columns.push({
           title: pItem.name,
@@ -1526,7 +1431,6 @@ export default {
           title: "规格名称",
           minWidth: 120,
           slot: "name",
->>>>>>> master
           align: "center",
         });
       });
@@ -1536,54 +1440,6 @@ export default {
         width: 240,
         align: "center",
       });
-<<<<<<< HEAD
-      columns.push({
-        title: "价格（￥）",
-        slot: "originalPrice",
-        width: 160,
-        align: "center",
-      });
-      columns.push({
-        title: "商品Token",
-        slot: "coinName",
-        width: 230,
-        align: "center",
-      });
-      columns.push({
-        title: "溯源哈希",
-        slot: "hash",
-        width: 180,
-        align: "center",
-      });
-      columns.push({
-        title: "重量（KG）",
-        slot: "weight",
-        width: 130,
-        align: "center",
-      });
-      columns.push({
-        title: "库存",
-        slot: "stock",
-        width: 160,
-        align: "center",
-      });
-      if (!this.isDetail && !this.isEdit && !this.isAgain) {
-        columns.push({
-          title: "操作",
-          slot: "opt",
-          width: 80,
-          align: "center",
-        });
-      }
-      this.columns = columns;
-    },
-    genSku() {
-      let resArr = [];
-      this.propList.forEach((item) => {
-        resArr = this.genSkuData(item, resArr);
-      });
-=======
->>>>>>> master
 
       this.data.sku = resArr;
     },
@@ -1655,16 +1511,6 @@ export default {
         });
       });
       columns.push({
-<<<<<<< HEAD
-        title: "缩略图",
-        slot: "image",
-        width: 240,
-        align: "center",
-      });
-
-      columns.push({
-=======
->>>>>>> master
         title: "重量（KG）",
         slot: "weight",
         width: 130,
@@ -1682,15 +1528,12 @@ export default {
         width: 230,
         align: "center",
       });
-<<<<<<< HEAD
-=======
       columns.push({
         title: "溯源哈希",
         slot: "hash",
         width: 180,
         align: "center",
       });
->>>>>>> master
       columns.push({
         title: "是否是隐藏款",
         slot: "isHide",
@@ -1798,13 +1641,8 @@ export default {
       this.editorUploadPercent = parseFloat(event.percent).toFixed(1);
     },
     imgBoforeUpload(file) {
-<<<<<<< HEAD
-      if (file.size >= 5 * 1024 * 1024) {
-        this.$Notice.warning({ title: "上传图片不得超过5MB！" });
-=======
       if (file.size >= 50 * 1024 * 1024) {
         this.$Notice.warning({ title: "上传图片不得超过50MB！" });
->>>>>>> master
         return false;
       }
       this.editorUploadPercent = 0;

src/view/good-mgr/product-list.vue

@@ -399,8 +399,6 @@ export default {
               ]
             );
           },
-<<<<<<< HEAD
-=======
         },
 
         {
@@ -464,31 +462,9 @@ export default {
             //   obj.label
             // );
           },
->>>>>>> master
         },
 
         {
-<<<<<<< HEAD
-          title: "状态",
-          key: "status",
-          align: "center",
-          width: 100,
-          render: (h, params) => {
-            let obj = OffShelfTypeObj[params.row.status] || {};
-            return h(
-              "Tag",
-              {
-                props: {
-                  color: obj.color,
-                },
-              },
-              obj.label
-            );
-          },
-        },
-        {
-=======
->>>>>>> master
           title: "失败理由",
           width: 130,
           align: "center",
@@ -567,10 +543,6 @@ export default {
                   //   display: this.isBrand ? 'inline-block' : 'none'
                   display:
                     status == OffShelfType.DRAFT ||
-<<<<<<< HEAD
-                    status == OffShelfType.OFFERING ||
-=======
->>>>>>> master
                     status == OffShelfType.CHECK_FAIL ||
                     status == OffShelfType.FAIL
                       ? "inline-block"
@@ -692,11 +664,7 @@ export default {
         autoOff:''
       },
       optionsDate: {
-<<<<<<< HEAD
-        disabledDate(date) {
-=======
         disabledDate (date) {
->>>>>>> master
           return date && date.valueOf() < Date.now() - 86400000;
         },
       },
@@ -881,12 +849,8 @@ export default {
             title,
             row.name,
             row.preheatEndTime,
-<<<<<<< HEAD
-            row.status
-=======
             row.status,
             row.autoOff
->>>>>>> master
           );
         } else {
           this.$Modal.confirm({
@@ -906,21 +870,14 @@ export default {
         }
       };
     },
-<<<<<<< HEAD
-    OffShelfModal(goodsId, type, title, name, preheatEndTime = 0, status) {
-=======
     OffShelfModal(goodsId, type, title, name, preheatEndTime = 0, status, autoOff) {
->>>>>>> master
       this.formData = {
         title,
         goodsId,
         type,
         preheatEndTime: "",
         name,
-<<<<<<< HEAD
-=======
         autoOff
->>>>>>> master
       };
       if (preheatEndTime && status === 10) {
         let date = formatTime(preheatEndTime, "yyyy-MM-dd hh:mm");
@@ -967,14 +924,11 @@ export default {
         },
       });
     },
-<<<<<<< HEAD
-=======
     showModal(){
       setTimeout(() => {
           this.detailModal = true;
         }, 200);
     },
->>>>>>> master
     handleCancel(row) {
       return () => {
         let goodsId = row.goodsId;
@@ -999,12 +953,6 @@ export default {
     handleRecommend(row) {
       //   return () => {}
     },
-<<<<<<< HEAD
-    handleRecommend(row) {
-      //   return () => {}
-    },
-=======
->>>>>>> master
   },
   created() {
     console.log(this.type);