yangfan пре 2 година
родитељ
комит
299abf3ed0

+ 1 - 1
admin/src/views/model/index.vue

@@ -225,7 +225,7 @@ export default {
       clearTimeout(this.timer)
     },
     picPreview (file) {
-      console.log('file',file)
+      console.log('file', file.data)
       this.picUrl = 'http://purchase.platomix.net/files/' + file.data.materialName
       this.editForm.templatePhoto = file.data.materialName
       this.addForm.templatePhoto = file.data.materialName

+ 84 - 201
admin/src/views/produce/productV2/addProduct.vue

@@ -2,100 +2,51 @@
   <div class="addProduct">
     <el-form :model="form" label-width="100px">
       <el-form-item label="产品名称">
-        <el-input
-          style="width: 300px"
-          v-model="form.productName"
-          placeholder="产品名称"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.productName" placeholder="产品名称"></el-input>
       </el-form-item>
       <el-form-item label="spid">
-        <el-input
-          style="width: 300px"
-          v-model="form.spid"
-          placeholder="spid"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.spid" placeholder="spid"></el-input>
       </el-form-item>
       <el-form-item label="cpid">
         <el-select v-model="form.cpid" placeholder="cpid" style="width: 300px">
-          <el-option
-            v-for="item in cpidList"
-            :key="item.cpid"
-            :label="item.cpid"
-            :value="item.cpid"
-          >
+          <el-option v-for="item in cpidList" :key="item.cpid" :label="item.cpid" :value="item.cpid">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="activeType">
-        <el-input
-          style="width: 300px"
-          v-model="form.activeType"
-          placeholder="科创定义activeType,根据对照表填写"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.activeType" placeholder="科创定义activeType,根据对照表填写"></el-input>
       </el-form-item>
       <el-form-item label="直冲阈值">
-        <el-input
-          style="width: 300px"
-          v-model="form.threshold"
-          placeholder="如无阈值设置,则填0"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.threshold" placeholder="如无阈值设置,则填0"></el-input>
         <div style="color: red">
           直冲阈值>0,开启订购自动领取会员,当日订购成功数满足阈值则开始自动领取该产品会员
         </div>
       </el-form-item>
       <el-form-item label="产品形态">
-        <el-select
-          v-model="form.isCompositeProduct"
-          placeholder="请选择"
-          style="width: 300px"
-        >
+        <el-select v-model="form.isCompositeProduct" placeholder="请选择" style="width: 300px">
           <el-option label="单产品" :value="0" />
           <el-option label="复合产品" :value="1" />
           <el-option label="多选一" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="产品原价">
-        <el-input
-          style="width: 300px"
-          v-model="form.originalPrice"
-          placeholder="产品原价"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.originalPrice" placeholder="产品原价"></el-input>
       </el-form-item>
       <el-form-item label="产品备注">
-        <el-input
-          style="width: 300px"
-          placeholder="产品备注"
-          v-model="form.remark"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="产品备注" v-model="form.remark"></el-input>
       </el-form-item>
       <el-form-item label="会员信息">
-        <el-input
-          style="width: 300px"
-          placeholder="若无,则留空"
-          v-model="form.memberName"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="若无,则留空" v-model="form.memberName"></el-input>
       </el-form-item>
       <el-form-item label="会员领取链接">
-        <el-input
-          style="width: 300px"
-          placeholder="会员领取链接"
-          v-model="productJson[0].memberUrl"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="会员领取链接" v-model="productJson[0].memberUrl"></el-input>
       </el-form-item>
       <el-form-item label="激活指引">
-        <el-input
-          style="width: 500px"
-          placeholder="激活指引"
-          v-model="form.flowJumpUrl"
-        ></el-input>
+        <el-input style="width: 500px" placeholder="激活指引" v-model="form.flowJumpUrl"></el-input>
       </el-form-item>
 
       <el-form-item label="分享文案">
-        <el-input
-          style="width: 500px"
-          v-model="form.remark3"
-          placeholder="微信分享副标题"
-        ></el-input>
+        <el-input style="width: 500px" v-model="form.remark3" placeholder="微信分享副标题"></el-input>
       </el-form-item>
       <el-form-item label="页面背景配色">
         <el-row :gutter="10">
@@ -144,140 +95,59 @@
           </el-col>
         </el-row>
       </el-form-item>
-      <!-- <el-form-item label="banner">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="bannerSuccess"
-        >
-          <img
-            v-if="form.bannerPics.length > 0"
-            :src="bannerUrl"
-            class="avatar"
-          />
+
+      <!-- 图片上传============================== -->
+      <el-form-item label="banner">
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="bannerSuccess">
+          <img v-if="form.bannerPics.length > 0" :src="bannerUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="form.bannerPics.length > 0"
-          @click="form.bannerPics = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="form.bannerPics.length > 0" @click="form.bannerPics = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="Logo">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="logoSuccess"
-        >
+
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="logoSuccess">
           <img v-if="form.logoPic" :src="logoUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="form.logoPic"
-          @click="form.logoPic = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="form.logoPic" @click="form.logoPic = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="配图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="guideSuccessP"
-        >
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="guideSuccessP">
           <img v-if="guidancePic.p" :src="guideUrlP" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="guidancePic.p"
-          @click="guidancePic.p = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="guidancePic.p" @click="guidancePic.p = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="产品说明图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="guideSuccessC"
-        >
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="guideSuccessC">
           <img v-if="guidancePic.c" :src="guideUrlC" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="guidancePic.c"
-          @click="guidancePic.c = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="guidancePic.c" @click="guidancePic.c = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="订购按钮图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="btnSuccess"
-        >
-          <img
-            v-if="productJson[0].btnUrl"
-            :src="productJson[0].btnUrl"
-            class="avatar"
-          />
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="btnSuccess">
+          <img v-if="productJson[0].btnUrl" :src="productJson[0].btnUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="productJson[0].btnUrl"
-          @click="productJson[0].btnUrl = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
-      </el-form-item> -->
+        <span v-if="productJson[0].btnUrl" @click="productJson[0].btnUrl = ''" style="color: #409eff; cursor: pointer">删除</span>
+      </el-form-item>
       <el-form-item label="炫彩UI">
-        <el-radio
-          v-model="productJson[0].productV"
-          label="1"
-          @change="radioChange"
-          >V1</el-radio
-        >
-        <el-radio
-          v-model="productJson[0].productV"
-          label="2"
-          @change="radioChange"
-          >V2</el-radio
-        >
+        <el-radio v-model="productJson[0].productV" label="1" @change="radioChange">V1</el-radio>
+        <el-radio v-model="productJson[0].productV" label="2" @change="radioChange">V2</el-radio>
       </el-form-item>
       <!-- 富文本编辑 -->
-      <!-- 富文本编辑 -->
       <el-form-item>
         <el-tabs type="border-card" style="margin-top: 20px">
           <el-tab-pane label="产品订购说明">
-            <quill-editor
-              ref="text"
-              class="myQuillEditor"
-              v-model="form.orderingInfo"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" class="myQuillEditor" v-model="form.orderingInfo" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="赠送话费说明">
-            <quill-editor
-              ref="text"
-              v-model="form.givePhoneInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.givePhoneInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="活动说明">
-            <quill-editor
-              ref="text"
-              v-model="form.manualInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.manualInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
         </el-tabs>
       </el-form-item>
@@ -287,8 +157,7 @@
             <el-button style="width: 100%" @click="close()">取消</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" style="width: 100%" @click="addClick"
-              >确定
+            <el-button type="primary" style="width: 100%" @click="addClick">确定
             </el-button>
           </el-col>
         </el-row>
@@ -310,9 +179,9 @@ export default {
   components: {
     quillEditor,
   },
-  data() {
+  data () {
     return {
-      imgapi: process.env.VUE_APP_BASE_IMG_API,
+      imgapi: "http://purchase.platomix.net/upload/material/uploadMaterial",
       addColors: {
         thc: {
           s: "#ffffff",
@@ -439,7 +308,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     document.title = "产品新增";
     let copyId = this.$route.query.copyId;
     if (copyId) {
@@ -452,13 +321,30 @@ export default {
         this.form = row;
         this.form.productName = row.productName + " 副本";
         if (row.bannerPics) {
+          console.log(row.bannerPics)
           this.bannerUrl =
-            process.env.VUE_APP_BASE_IMG_URL +
-            "/" +
-            JSON.parse(row.bannerPics)[0];
+            'http://purchase.platomix.net/files/' + "/" + JSON.parse(row.bannerPics)[0];
         }
         if (row.logoPic) {
-          this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + "/" + row.logoPic;
+          console.log(row.logoPic)
+          this.logoUrl = 'http://purchase.platomix.net/files/' + "/" + JSON.parse(row.logoPic)[0];
+
+        }
+        if (JSON.parse(row.guidancePic).p) {
+          this.guideUrlP = 'http://purchase.platomix.net/files/' + JSON.parse(row.guidancePic).p;
+          this.guidancePic.p = JSON.parse(row.guidancePic).p;
+
+        }
+        if (JSON.parse(row.guidancePic).c) {
+          this.guideUrlC = 'http://purchase.platomix.net/files/' + JSON.parse(row.guidancePic).c;
+          this.guidancePic.c = JSON.parse(row.guidancePic).c;
+
+        }
+        if (row.btnUrl) {
+          console.log(row.btnUrl)
+          this.btnUrl = 'http://purchase.platomix.net/files/' + "/" + JSON.parse(row.btnUrl)[0];
+          console.log(this.btnUrl)
+
         }
         this.addColors.thc = {
           s: JSON.parse(row.themeColor)[0],
@@ -470,23 +356,14 @@ export default {
           ss: JSON.parse(row.bgColor)[2],
           ee: JSON.parse(row.bgColor)[3],
         };
-        if (JSON.parse(row.guidancePic).p) {
-          this.guideUrlP =
-            process.env.VUE_APP_BASE_IMG_URL + JSON.parse(row.guidancePic).p;
-          this.guidancePic.p = JSON.parse(row.guidancePic).p;
-        }
-        if (JSON.parse(row.guidancePic).c) {
-          this.guideUrlC =
-            process.env.VUE_APP_BASE_IMG_URL + JSON.parse(row.guidancePic).c;
-          this.guidancePic.c = JSON.parse(row.guidancePic).c;
-        }
+
         if (row.cacheSeatOne !== null) {
           this.productJson = JSON.parse(row.cacheSeatOne);
         }
       });
     }
   },
-  mounted() {
+  mounted () {
     listProduct(this.searchForm).then((response) => {
       this.cpidList = response.data.list;
     });
@@ -494,7 +371,7 @@ export default {
   },
   methods: {
     // 确认新增
-    addClick() {
+    addClick () {
       this.form.themeColor = JSON.stringify([
         this.addColors.thc.s,
         this.addColors.thc.e,
@@ -520,31 +397,37 @@ export default {
         });
       });
     },
-    close() {
+    close () {
       this.$router.back();
     },
-    bannerSuccess(file, fileList) {
-      this.bannerUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
+    bannerSuccess (file, fileList) {
+      this.bannerUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
+
       let arr = [];
-      arr.push(file.data);
+      arr.push(file.data.materialName);
       this.form.bannerPics = JSON.stringify(arr);
+
     },
-    logoSuccess(file) {
-      this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.form.logoPic = file.data;
+    logoSuccess (file) {
+      this.logoUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      let arr = [];
+      arr.push(file.data.materialName);
+      this.form.logoPic = JSON.stringify(arr);
     },
-    guideSuccessP(file) {
-      this.guideUrlP = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.guidancePic.p = file.data;
+    guideSuccessP (file) {
+      this.guideUrlP = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      this.guidancePic.p = file.data.materialName;
+      console.log(this.guidancePic.p, this.guideUrlP)
+
     },
-    guideSuccessC(file) {
-      this.guideUrlC = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.guidancePic.c = file.data;
+    guideSuccessC (file) {
+      this.guideUrlC = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      this.guidancePic.c = file.data.materialName;
     },
-    btnSuccess(file) {
-      this.productJson[0].btnUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
+    btnSuccess (file) {
+      this.productJson[0].btnUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
     },
-    radioChange() {
+    radioChange () {
       if (this.productJson[0].productV === "2") {
         this.form.givePhoneInfo =
           "<p><strong>产品</strong> xxxx流量会员合约包</p><p><strong>资费</strong> <strong>首月xx元,次月起xx元/月</strong></p><p><strong>内容</strong> xxGB定向流量+xxxx会员</p><p><strong>合约</strong> <strong>本产品合约期为6个月,第六个月方可退订,用户在合约期内解除合约时,需补足首月优惠金额,切在原合约期结束后方能再次退订</strong></p>";

+ 194 - 192
admin/src/views/produce/productV2/editProduct.vue

@@ -2,102 +2,53 @@
   <div class="edit">
     <el-form :model="form" label-width="100px">
       <el-form-item label="产品名称">
-        <el-input
-          style="width: 300px"
-          v-model="form.productName"
-          placeholder="产品名称"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.productName" placeholder="产品名称"></el-input>
       </el-form-item>
       <el-form-item label="spid">
-        <el-input
-          style="width: 300px"
-          v-model="form.spid"
-          placeholder="spid"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.spid" placeholder="spid"></el-input>
       </el-form-item>
       <el-form-item label="cpid">
         <el-select v-model="form.cpid" placeholder="cpid" style="width: 300px">
-          <el-option
-            v-for="item in cpidList"
-            :key="item.cpid"
-            :label="item.cpid"
-            :value="item.cpid"
-          >
+          <el-option v-for="item in cpidList" :key="item.cpid" :label="item.cpid" :value="item.cpid">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="activeType">
-        <el-input
-          style="width: 300px"
-          v-model="form.activeType"
-          placeholder="科创定义activeType,根据对照表填写"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.activeType" placeholder="科创定义activeType,根据对照表填写"></el-input>
       </el-form-item>
       <el-form-item label="直冲阈值">
-        <el-input
-          style="width: 300px"
-          v-model="form.threshold"
-          placeholder="如无阈值设置,则填0"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.threshold" placeholder="如无阈值设置,则填0"></el-input>
         <div style="color: red">
           直冲阈值>0,开启订购自动领取会员,当日订购成功数满足阈值则开始自动领取该产品会员
         </div>
       </el-form-item>
       <el-form-item label="产品形态">
-        <el-select
-          v-model="form.isCompositeProduct"
-          placeholder="请选择"
-          style="width: 300px"
-        >
+        <el-select v-model="form.isCompositeProduct" placeholder="请选择" style="width: 300px">
           <el-option label="单产品" :value="0" />
           <el-option label="复合产品" :value="1" />
           <el-option label="多选一" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="产品原价">
-        <el-input
-          style="width: 300px"
-          v-model="form.originalPrice"
-          placeholder="产品原价"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.originalPrice" placeholder="产品原价"></el-input>
       </el-form-item>
       <el-form-item label="产品备注">
-        <el-input
-          style="width: 300px"
-          placeholder="产品备注"
-          v-model="form.remark"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="产品备注" v-model="form.remark"></el-input>
       </el-form-item>
       <el-form-item label="会员信息">
-        <el-input
-          style="width: 300px"
-          placeholder="若无,则留空"
-          v-model="form.memberName"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="若无,则留空" v-model="form.memberName"></el-input>
       </el-form-item>
       <el-form-item label="会员领取链接">
-        <el-input
-          style="width: 300px"
-          placeholder="会员领取链接"
-          v-model="productJson[0].memberUrl"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="会员领取链接" v-model="productJson[0].memberUrl"></el-input>
       </el-form-item>
       <el-form-item label="激活指引">
-        <el-input
-          style="width: 500px"
-          placeholder="激活指引"
-          v-model="form.flowJumpUrl"
-        ></el-input>
+        <el-input style="width: 500px" placeholder="激活指引" v-model="form.flowJumpUrl"></el-input>
       </el-form-item>
       <!-- <el-form-item label="分享标题">
                     <el-input style="width: 500px" v-model="form.pageTitle"></el-input>
                   </el-form-item> -->
       <el-form-item label="分享文案">
-        <el-input
-          style="width: 500px"
-          v-model="form.remark3"
-          placeholder="微信分享副标题"
-        ></el-input>
+        <el-input style="width: 500px" v-model="form.remark3" placeholder="微信分享副标题"></el-input>
       </el-form-item>
       <el-form-item label="页面背景配色">
         <el-row :gutter="10">
@@ -149,99 +100,41 @@
           </el-col>
         </el-row>
       </el-form-item>
-      <!-- <el-form-item label="banner">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="bannerSuccess"
-        >
-          <img
-            v-if="form.bannerPics.length > 0"
-            :src="bannerUrl"
-            class="avatar"
-          />
+      <el-form-item label="banner">
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="bannerSuccess">
+          <img v-if="form.bannerPics.length > 0" :src="bannerUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="form.bannerPics.length > 0"
-          @click="form.bannerPics = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="form.bannerPics.length > 0" @click="form.bannerPics = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="Logo">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="logoSuccess"
-        >
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="logoSuccess">
           <img v-if="form.logoPic" :src="logoUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="form.logoPic"
-          @click="form.logoPic = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="form.logoPic" @click="form.logoPic = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="配图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="guideSuccessP"
-        >
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="guideSuccessP">
           <img v-if="guidancePic.p" :src="guideUrlP" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="guidancePic.p"
-          @click="guidancePic.p = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="guidancePic.p" @click="guidancePic.p = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="产品说明图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="guideSuccessC"
-        >
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="guideSuccessC">
           <img v-if="guidancePic.c" :src="guideUrlC" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="guidancePic.c"
-          @click="guidancePic.c = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
+        <span v-if="guidancePic.c" @click="guidancePic.c = ''" style="color: #409eff; cursor: pointer">删除</span>
       </el-form-item>
       <el-form-item label="订购按钮图">
-        <el-upload
-          class="avatar-uploader"
-          :show-file-list="false"
-          :action="imgapi"
-          :on-success="btnSuccess"
-        >
-          <img
-            v-if="productJson[0].btnUrl"
-            :src="productJson[0].btnUrl"
-            class="avatar"
-          />
+        <el-upload class="avatar-uploader" :show-file-list="false" :action="imgapi" :on-success="btnSuccess">
+          <img v-if="productJson[0].btnUrl" :src="productJson[0].btnUrl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
-        <span
-          v-if="productJson[0].btnUrl"
-          @click="productJson[0].btnUrl = ''"
-          style="color: #409eff; cursor: pointer"
-          >删除</span
-        >
-      </el-form-item> -->
+        <span v-if="productJson[0].btnUrl" @click="productJson[0].btnUrl = ''" style="color: #409eff; cursor: pointer">删除</span>
+      </el-form-item>
       <el-form-item label="炫彩UI">
         <el-radio v-model="productJson[0].productV" label="1">V1</el-radio>
         <el-radio v-model="productJson[0].productV" label="2">V2</el-radio>
@@ -250,28 +143,13 @@
       <el-form-item>
         <el-tabs type="border-card" style="margin-top: 20px">
           <el-tab-pane label="产品订购说明">
-            <quill-editor
-              ref="text"
-              class="myQuillEditor"
-              v-model="form.orderingInfo"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" class="myQuillEditor" v-model="form.orderingInfo" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="赠送话费说明">
-            <quill-editor
-              ref="text"
-              v-model="form.givePhoneInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.givePhoneInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="活动说明">
-            <quill-editor
-              ref="text"
-              v-model="form.manualInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.manualInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
         </el-tabs>
       </el-form-item>
@@ -281,8 +159,7 @@
             <el-button style="width: 100%" @click="close()">取消</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" style="width: 100%" @click="sureClick"
-              >确定
+            <el-button type="primary" style="width: 100%" @click="sureClick">确定
             </el-button>
           </el-col>
         </el-row>
@@ -304,10 +181,10 @@ export default {
   components: {
     quillEditor,
   },
-  data() {
+  data () {
     return {
       id: "",
-      imgapi: process.env.VUE_APP_BASE_IMG_API,
+      imgapi: 'http://purchase.platomix.net/upload/material/uploadMaterial',
       addColors: {
         thc: {
           s: "#ffffff",
@@ -433,7 +310,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     document.title = "产品修改";
     getOne({
       id: this.$route.query.ids,
@@ -442,6 +319,129 @@ export default {
       let row = res.data;
       row.threshold = row.threshold ? row.threshold : 0;
       this.form = row;
+
+      if (row.bannerPics) {
+        this.imgUrl = JSON.parse(row.bannerPics);
+
+        if (this.imgUrl[0] !== "" && this.imgUrl[0] !== null && this.imgUrl[0]) {
+          this.bannerUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[0];
+
+          // console.log(2222, this.bannerUrl)
+        }
+        if (this.imgUrl[2] !== "" && this.imgUrl[2] !== null && this.imgUrl[2]) {
+          this.bannerUrl2 = 'http://purchase.platomix.net/files/' + this.imgUrl[2];
+        }
+        if (this.imgUrl[1] !== "" && this.imgUrl[1] !== null && this.imgUrl[1]
+        ) {
+          this.svgUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[1];
+          this.lottie = lottie.loadAnimation({
+            container: document.getElementById("lottie_box"),
+            renderer: "svg",
+            loop: true,
+            autoplay: true,
+            path: this.svgUrl,
+          });
+
+        }
+      }
+      if (row.logoPic) {
+        this.imgUrl = JSON.parse(row.logoPic);
+
+        if (this.imgUrl[0] !== "" && this.imgUrl[0] !== null && this.imgUrl[0]) {
+          this.logoUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[0];
+
+          // console.log(2222, this.logoUrl)
+        }
+        if (
+          this.imgUrl[2] !== "" &&
+          this.imgUrl[2] !== null &&
+          this.imgUrl[2]
+        ) {
+          console.log(333)
+          this.bannerUrl2 = 'http://purchase.platomix.net/files/' + this.imgUrl[2];
+        }
+        if (
+          this.imgUrl[1] !== "" &&
+          this.imgUrl[1] !== null &&
+          this.imgUrl[1]
+        ) {
+          this.svgUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[1];
+          this.lottie = lottie.loadAnimation({
+            container: document.getElementById("lottie_box"),
+            renderer: "svg",
+            loop: true,
+            autoplay: true,
+            path: this.svgUrl,
+          });
+
+        }
+
+      }
+      if (row.guidancePic) {
+        this.imgUrl = JSON.parse(row.guidancePic);
+        if (this.imgUrl[0] !== "" && this.imgUrl[0] !== null && this.imgUrl[0]) {
+          this.guideUrlP = 'http://purchase.platomix.net/files/' + this.imgUrl[0];
+
+          console.log(2222, this.guideUrlP)
+        }
+        if (
+          this.imgUrl[2] !== "" &&
+          this.imgUrl[2] !== null &&
+          this.imgUrl[2]
+        ) {
+          console.log(333)
+          this.bannerUrl2 = 'http://purchase.platomix.net/files/' + this.imgUrl[2];
+        }
+        if (
+          this.imgUrl[1] !== "" &&
+          this.imgUrl[1] !== null &&
+          this.imgUrl[1]
+        ) {
+          this.svgUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[1];
+          this.lottie = lottie.loadAnimation({
+            container: document.getElementById("lottie_box"),
+            renderer: "svg",
+            loop: true,
+            autoplay: true,
+            path: this.svgUrl,
+          });
+
+        }
+
+      }
+      if (row.guidancePic) {
+        this.imgUrl = JSON.parse(row.guidancePic);
+        if (this.imgUrl[0] !== "" && this.imgUrl[0] !== null && this.imgUrl[0]) {
+          this.guideUrlC = 'http://purchase.platomix.net/files/' + this.imgUrl[0];
+
+          console.log(2222, this.guideUrlP)
+        }
+        if (
+          this.imgUrl[2] !== "" &&
+          this.imgUrl[2] !== null &&
+          this.imgUrl[2]
+        ) {
+          console.log(333)
+          this.bannerUrl2 = 'http://purchase.platomix.net/files/' + this.imgUrl[2];
+        }
+        if (
+          this.imgUrl[1] !== "" &&
+          this.imgUrl[1] !== null &&
+          this.imgUrl[1]
+        ) {
+          this.svgUrl = 'http://purchase.platomix.net/files/' + this.imgUrl[1];
+          this.lottie = lottie.loadAnimation({
+            container: document.getElementById("lottie_box"),
+            renderer: "svg",
+            loop: true,
+            autoplay: true,
+            path: this.svgUrl,
+          });
+
+        }
+
+      }
+
       this.addColors.thc = {
         s: JSON.parse(row.themeColor)[0],
         e: JSON.parse(row.themeColor)[1],
@@ -457,24 +457,16 @@ export default {
       // row.threshold = row.threshold ? row.threshold : 0;
       // this.form = row;
 
-      if (row.bannerPics) {
-        this.bannerUrl =
-          process.env.VUE_APP_BASE_IMG_URL +
-          "/" +
-          JSON.parse(row.bannerPics)[0];
-      }
-      if (row.logoPic) {
-        this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + "/" + row.logoPic;
-      }
+
 
       if (JSON.parse(row.guidancePic).p) {
         this.guideUrlP =
-          process.env.VUE_APP_BASE_IMG_URL + JSON.parse(row.guidancePic).p;
+          'http://purchase.platomix.net/files/' + JSON.parse(row.guidancePic).p;
         this.guidancePic.p = JSON.parse(row.guidancePic).p;
       }
       if (JSON.parse(row.guidancePic).c) {
         this.guideUrlC =
-          process.env.VUE_APP_BASE_IMG_URL + JSON.parse(row.guidancePic).c;
+          'http://purchase.platomix.net/files/' + JSON.parse(row.guidancePic).c;
         this.guidancePic.c = JSON.parse(row.guidancePic).c;
       }
       if (row.cacheSeatOne !== null) {
@@ -482,13 +474,13 @@ export default {
       }
     });
   },
-  mounted() {
+  mounted () {
     listProduct(this.searchForm).then((response) => {
       this.cpidList = response.data.list;
     });
   },
   methods: {
-    sureClick() {
+    sureClick () {
       this.$confirm("确定要修改吗?")
         .then((_) => {
           this.form.themeColor = JSON.stringify([
@@ -513,42 +505,52 @@ export default {
               this.editDialog = false;
             }, 400);
           });
-          // put("/product/info/update", this.form).then((res) => {
-          //   if (res.code === 0) this.$message.success("修改成功");
-
-          //   setTimeout(() => {
-          //     this.$router.back();
-          //     this.editDialog = false;
-          //   }, 400);
-          // });
+          put("/product/info/update", this.form).then((res) => {
+            if (res.code === 0) this.$message.success("修改成功");
+
+            setTimeout(() => {
+              this.$router.back();
+              this.editDialog = false;
+            }, 400);
+          });
         })
         .catch((_) => {
           this.editDialog = false;
         });
     },
-    close() {
+    close () {
       this.$router.back()();
     },
-    bannerSuccess(file) {
-      this.bannerUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
+    bannerSuccess (file, fileList) {
+      this.bannerUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
+
       let arr = [];
-      arr.push(file.data);
+      arr.push(file.data.materialName);
       this.form.bannerPics = JSON.stringify(arr);
+      console.log(this.form.bannerPics)
+
     },
-    logoSuccess(file) {
-      this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.form.logoPic = file.data;
+    logoSuccess (file) {
+      this.logoUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      let arr = [];
+      arr.push(file.data.materialName);
+      this.form.logoPic = JSON.stringify(arr);
+      console.log(this.form.logoPic)
     },
-    guideSuccessP(file) {
-      this.guideUrlP = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.guidancePic.p = file.data;
+    guideSuccessP (file) {
+      console.log(file.data.materialName)
+      this.guideUrlP = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      this.guidancePic.p = file.data.materialName;
+      console.log(this.guidancePic.p, this.guideUrlP)
+
     },
-    guideSuccessC(file) {
-      this.guideUrlC = process.env.VUE_APP_BASE_IMG_URL + file.data;
-      this.guidancePic.c = file.data;
+    guideSuccessC (file) {
+      this.guideUrlC = 'http://purchase.platomix.net/files/' + file.data.materialName;
+      this.guidancePic.c = file.data.materialName;
     },
-    btnSuccess(file) {
-      this.productJson[0].btnUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
+    btnSuccess (file) {
+      this.productJson[0].btnUrl = 'http://purchase.platomix.net/files/' + file.data.materialName;
+
     },
   },
 };

+ 18 - 31
admin/src/views/schemeGlobal/index.vue

@@ -41,11 +41,11 @@
         <el-table-column label="操作">
           <template slot-scope="scope">
             <template v-if="userName === '系统管理员' || userName === '李彤'">
-              <el-button v-show="scope.row.status === 1" @click="audit({row, status:3})">通过</el-button>
-              <el-button v-show="scope.row.status === 1" @click="audit({row, status:4})">驳回</el-button>
+              <el-button v-show="scope.row.status === 1" @click="audit(scope.row, {status:3})">通过</el-button>
+              <el-button v-show="scope.row.status === 1"  @click="audit(scope.row, { status: 4 })">驳回</el-button>
             </template>
             <template v-if="userName === scope.row.applicant && scope.row.status === 1">
-              <el-button @click="audit({row, status:2})">撤回</el-button>
+              <el-button @click="audit(scope.row, { status: 2 })">撤回</el-button>
             </template>
           </template>
         </el-table-column>
@@ -106,7 +106,6 @@ export default {
     }
   },
   created () {
-    console.log('用户:', this.$store.state.user.name)
     this.userName = this.$store.state.user.name
   },
   mounted () {
@@ -127,8 +126,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(this.form)
-
         addapplication(this.form).then(res => {
           this.$message({
             message: '操作成功',
@@ -149,13 +146,8 @@ export default {
     },
     // 控制项列表
     getItemList () {
-
       listSchemeGlobal({ pageNo: 1, pageSize: 100, }).then(res => {
-        // console.log(res.data.list)
         this.itemList = res.data.list
-        // that.itemList = res.data.list / strategy - global - record / page
-        // console.log(this.itemList)
-
       })
 
     },
@@ -180,7 +172,6 @@ export default {
     },
     // 新增打开申请
     open (row) {
-      console.log(row)
       this.form = {
         applicant: this.userName,
         applyReason: "",
@@ -195,10 +186,8 @@ export default {
     },
     // 新增关闭申请
     close (row) {
-      console.log(row)
       this.form = {
         applicant: this.userName,
-
         applyReason: "",
         infoId: row.id,
         name: row.name,
@@ -212,26 +201,28 @@ export default {
 
 
     // 新增关闭申请
-    audit ({ row, status }) {
-      this.$confirm(`确定${this.strategyStatus[status]}该申请么, 是否继续?`, '提示', {
+    audit (row, obj) {
+
+      this.$confirm(`确定${this.strategyStatus[obj.status]}该申请么, 是否继续?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+
         let update = {
           applicant: row.applicant,
-
           applyReason: row.applyReason,
           infoId: row.infoId,
           name: row.name,
           operDetail: row.operDetail,
-          status: status,
+          status: obj.status,
           tag: row.tag,
           id: row.id
         }
+        console.log(update)
         put('/strategy/global-info/update', update).then(res => {
           this.$message({
-            message: res.message,
+            message: "操作成功",
             type: 'success',
             duration: 3000,
             offset: 360
@@ -239,24 +230,20 @@ export default {
           this.init()
           this.getItemList()
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
+      })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          });
         });
-      });
     },
 
-    // 翻页
-    handlePageChange ({ currentPage, pageSize }) {
-      this.searchForm.pageNo = currentPage
-      this.searchForm.pageSize = pageSize
-      this.init()
-    },
+
 
     // 行颜色
     rowClassName ({ row, rowIndex }) {
-      // console.log(row)
+      console.log(row)
       if (row.status === 1) {
         return 'row-green'
       }