edit

src/components/uploadPicture/index.vue

@@ -949,4 +949,7 @@ export default {
   font-size: 12px;
   white-space: nowrap;
 }
+::v-deep.el-radio-group{
+  vertical-align: top;
+}
 </style>

src/components/uploadPicture/uploadFrom/index.js

@@ -14,10 +14,12 @@ uploadFrom.install = function (Vue, options) {
   const instance = new ToastConstructor()
   instance.$mount(document.createElement('div'))
   document.body.appendChild(instance.$el)
-  Vue.prototype.$modalUpload = function (callback, isMore) {
+  Vue.prototype.$modalUpload = function (callback, isMore, isPage) {
     instance.visible = true
+    console.log(instance);
     instance.callback = callback
     instance.isMore = isMore
+    instance.isPage = isPage
   }
 }
 export default uploadFrom

src/components/uploadPicture/uploadFrom/index.vue

@@ -3,10 +3,10 @@
     <el-dialog
       title="上传图片"
       :visible.sync="visible"
-      width="1000px"
+      width="1300px"
       :before-close="handleClose"
     >
-      <upload-index v-if="visible" :is-more="isMore" @getImage="getImage" />
+      <upload-index v-if="visible" :is-more="isMore" :is-page="isPage" @getImage="getImage" />
     </el-dialog>
   </div>
 </template>
@@ -21,7 +21,8 @@ export default {
     return {
       visible: false,
       callback: function() {},
-      isMore: ''
+      isMore: '',
+      isPage:false
     }
   },
   watch: {

src/components/uploadVideo/index.vue

@@ -92,8 +92,10 @@ export default {
       if(this.isDiy){
         this.$emit('getVideo',this.formValidate.video_link)
       }else if(nowEditor){
+        let video_html = `<p><span contenteditable="false" data-mce-object="video" data-mce-p-allowfullscreen="allowfullscreen" data-mce-p-frameborder="no" data-mce-p-scrolling="no" data-mce-p-src="${this.formValidate.video_link}" ><video src='${this.formValidate.video_link}' width="320" height="180" controls></video></span></p>`
         nowEditor.dialog.close(true)
-        nowEditor.editor.setContent("<video src='" + this.formValidate.video_link + "' controls='controls'></video>", true)
+        nowEditor.editor.execCommand("insertHtml", video_html);
+        // nowEditor.editor.setContent(`<p><video src='${this.formValidate.video_link}' width="320" height="180" controls ></video><br></p>`, true)
       }
      
     }

src/views/order/orderInvoice/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
+      <el-form ref="searchForm" :model="tableFrom" size="small" inline label-width="85px">
         <el-form-item label="订单状态：" class="width100" prop="order_type">
           <el-radio-group v-model="tableFrom.order_type" type="button" @change="getList(1)">
             <el-radio-button label="">全部 </el-radio-button>
@@ -32,8 +32,8 @@
             v-model="tableFrom.keyword"
             placeholder="请输入订单号/收货人/联系方式"
             class="selWidth"
-            @keyup.enter.native="getList(1)"
             clearable
+            @keyup.enter.native="getList(1)"
           />
         </el-form-item>
         <el-form-item label="开票状态：" prop="status">
@@ -57,13 +57,13 @@
             v-model="tableFrom.username"
             placeholder="请输入用户昵称/手机号"
             class="selWidth"
-            @keyup.enter.native="getList(1)"
             clearable
+            @keyup.enter.native="getList(1)"
           />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-          <el-button size="small" @click="searchReset()">重置</el-button> 
+          <el-button size="small" @click="searchReset()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -96,7 +96,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="receipt_price" label="发票金额" min-width="90" />
-        <el-table-column prop="receipt_sn" label="发票单号" min-width="120" />
+        <el-table-column prop="receipt_sn" label="申请单号" min-width="120" />
         <el-table-column label="发票类型" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.receipt_info">{{ scope.row.receipt_info.receipt_type == 1 ? '普通发票' : '专用发票' }}</span>
@@ -195,7 +195,7 @@ import {
   invoiceInfoApi,
   invoiceApi
 } from '@/api/order'
-import timeOptions from '@/utils/timeOptions';
+import timeOptions from '@/utils/timeOptions'
 export default {
   name: 'OrderInvoice',
   data() {
@@ -259,10 +259,10 @@ export default {
   },
 
   methods: {
-    /**重置 */
+    /** 重置 */
-    searchReset(){
+    searchReset() {
       this.timeVal = []
-      this.tableFrom.date = ""
+      this.tableFrom.date = ''
       this.$refs.searchForm.resetFields()
       this.getList(1)
     },

src/views/product/addProduct/index.vue

@@ -2637,10 +2637,6 @@ export default {
     window.removeEventListener('popstate', this.goBack, false)
   },
   methods: {
-    // handleLeave(activeName, oldActiveName){
-    //   console.log(!!this.$route.params.id);
-    //   return !!this.$route.params.id
-    // },
     onsubmit(){
       this.dialogVisible = false
     },
@@ -2669,7 +2665,6 @@ export default {
       }
     },
     handlCommodity(name) {
-      console.log(this.importBusinessList);
       this.$refs[name].clearValidate()
     },
     beforeUpload(file,fileList) {
@@ -2679,7 +2674,6 @@ export default {
       }
     },
     handlePictureCardPreview(file) {
-      console.log(file);
       // 预览pdf
       if (['application/pdf'].includes(file.type)) {
         window.open(file.url)
@@ -2710,7 +2704,6 @@ export default {
           fileList.map(item => {
             arr.push({ name:item.name,uid:item.uid,url: item?.response?.data?.src||item.url,type:item?.raw?.type||item.type})
           })
-          console.log(fileList);
           this.formValidate.qualification[name] = arr
           console.log(this.formValidate.qualification[name]);
         }

src/views/product/productList/index.vue

@@ -87,7 +87,7 @@
             <el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="时间选择：" prop="create_time">
+        <el-form-item label="创建时间：" prop="create_time">
           <el-date-picker
           v-model="timeVal"
           value-format="yyyy/MM/dd"
@@ -216,7 +216,7 @@
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" class="mr10" @click="onDetails(scope.row.product_id)">详情</el-button>
-            <router-link v-if="tableFrom.type != 5" :to="{path: roterPre + '/product/list/addProduct/' + scope.row.product_id}">
+            <router-link v-if="tableFrom.type != 5 && tableFrom.type!=12" :to="{path: roterPre + '/product/list/addProduct/' + scope.row.product_id}">
               <el-button type="text" size="small" class="mr10">编辑</el-button>
             </router-link>
             <el-button v-if="tableFrom.type !== '5'" type="text" size="small" class="mr10" @click="handlePreview(scope.row.product_id)">预览</el-button>

src/views/product/productList/proDetails.vue

@@ -143,6 +143,10 @@
                   <div class="item-title">规格：</div>
                   <div class="value">{{productData.spec_type == 1 ? "多规格" : "单规格"}}</div>
                 </li>
+                <li class="item item100">
+                  <div class="item-title">佐证图片：</div>
+                  <el-image v-for="(item,index) in productData.status_img" :key="index" :src="item" style="width:40px;height:40px;margin-right:12px;" :preview-src-list="productData.status_img" />
+                </li> 
               </ul>
             </div>
             <div class="section" style="margin-top: 50px;">
@@ -163,7 +167,13 @@
                     </el-table-column>
                     <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
                       <template slot-scope="scope">
-                        <span class="priceBox" v-text="scope.row[iii]" />
+                        <a
+                          v-if="formThead[iii].title == '依据链接'"
+                          :href="scope.row[iii]"
+                          target="_blank"
+                          >{{ scope.row[iii] }}</a
+                        >
+                        <span v-else class="priceBox" v-text="scope.row[iii]" />
                       </template>
                     </el-table-column>
                     <template v-if="productData.extension_type === 1">
@@ -196,7 +206,13 @@
                     </el-table-column>
                     <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="100">
                       <template slot-scope="scope">
-                        <span class="priceBox">{{ scope.row[iii] }}</span>
+                        <a
+                          v-if="formThead[iii].title == '依据链接'"
+                          :href="scope.row[iii]"
+                          target="_blank"
+                          >{{ scope.row[iii] }}</a
+                        >
+                        <span v-else class="priceBox">{{ scope.row[iii] }}</span>
                       </template>
                     </el-table-column>
                     <template v-if="productData.extension_type === 1">
@@ -294,9 +310,9 @@
           <el-tab-pane label="审核回复栏" name="audit">
             <div class="section">
               <ul class="list">
-                <li class="item" v-if="productData.refusal">
+                <li class="audit" v-if="productData.refusal">
                   <div class="item-title">审核拒绝原因：</div>
-                  <div class="value">{{productData.refusal || ''}}</div>
+                  <div style="margin-left: 100px;" class="value">{{productData.refusal || ''}}</div>
                 </li>
                 <li class="item item100">
                   <div class="item-title">佐证图片：</div>
@@ -726,6 +742,7 @@ const defaultObj = {
     ot_price: null,
     stock: null,
     bar_code: '',
+    gist_url:'',
     weight: null,
     volume: null
   }],
@@ -758,6 +775,9 @@ const objTitle = {
   weight: {
     title: '重量（KG）'
   },
+  gist_url: {
+    title: '依据链接'
+  },
   volume: {
     title: '体积(m³)'
   }
@@ -1066,6 +1086,15 @@ export default {
     padding: 0;
     margin: 0;
   }
+  .audit{
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    .item-title{
+      width: 100px;
+      text-align: right;
+    }
+  }
   .item {
     flex: 0 0 calc(100% / 3);
     display: flex;

src/views/systemForm/setSystem/modifyStoreInfo.vue

@@ -374,11 +374,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="商户关键字：" prop="mer_keyword">
+                <!-- <el-form-item label="商户关键字：" prop="mer_keyword">
                   <div class="tip-form">
                     <el-input v-model="merData.mer_keyword" class="pageWidth" placeholder="用户在搜索该关键字时，可搜索到本店铺" />
                   </div>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="联系客服方式：">
                   <el-radio-group
                     v-model="merData.services_type"
@@ -1097,7 +1097,7 @@ export default {
         if (tit === '3' && !num) {
           _this.merData.mini_banner = img[0]
         }
-      }, tit)
+      }, tit,true)
     },
 
     // 资质图片删除