优化

purchase_H5/src/components/hideModal.vue

@@ -6,12 +6,12 @@
         <div class="title active">隐私声明</div>
       </div>
       <div class="main">
-        <p style="font-weight:bold">隐私政策主要条款参考表述</p>
+        <p style="font-weight:bold">隐私政策主要条款</p>
         <p>一、隐私政策的适用范围及重点说明</p>
         <p>首次发布日期：2021年11月5日</p>
         <p>本次更新发布日期：2022年6月10日</p>
         <p>本版本生效日期：2022年6月10日</p>
-        <p>【公司名称】（以下称为“我们”）非常重视用户的隐私和个人信息保护，致力于维持您对我们的信任。我们承诺采取相应的安全保护措施来保护您的个人信息。请在使用我们各项产品或服务（以下统称“我们的产品或服务”）前，仔细阅读并了解《联通在线信息科技有限公司隐私政策》（以下称为“本隐私政策”）。</p>
+        <p>【联通在线信息科技有限公司】（以下称为“我们”）非常重视用户的隐私和个人信息保护，致力于维持您对我们的信任。我们承诺采取相应的安全保护措施来保护您的个人信息。请在使用我们各项产品或服务（以下统称“我们的产品或服务”）前，仔细阅读并了解《联通在线信息科技有限公司隐私政策》（以下称为“本隐私政策”）。</p>
         <p>您在使用我们的产品或服务时，我们需要按照国家法律法规及监管政策的相关要求在获得您授权同意的情况下（法律另有规定的除外）处理您的信息，我们希望通过本隐私政策向您说明：在您使用我们的产品或服务时，我们会收集哪些信息、为什么收集这些信息、会使用这些信息做什么以及我们如何保护这些信息。</p>
         <p>本隐私政策与您所使用的我们的产品或服务息息相关，对于您行使个人权利及保护您的个人信息至关重要，请您在使用我们的产品或服务前认真阅读并充分理解本隐私政策所写明的内容。</p>
         <p>阅读过程中，如您对我们的隐私政策及服务条款的内容有任何疑问，请联系我们。一旦您点击同意按钮，即表示您已经理解并同意本隐私政策全部内容。</p>

purchase_H5/src/components/unifyColor.vue

@@ -23,24 +23,10 @@
             <p style="margin: 0; padding: 0">我已阅读并同意</p>
           </div>
         </van-checkbox>
-        <span class="span" :style="
-            productJson.length > 0 && productJson[0].proC.e !== ''
-              ? { color: `${productJson[0].proC.e}` }
-              : { color: '#000' }
-          " @click="$emit('hideClick')">《隐私声明》</span>
-        <span class="span" :style="
-            productJson.length > 0 && productJson[0].proC.e !== ''
-              ? { color: `${productJson[0].proC.e}` }
-              : { color: '#000' }
-          " @click="$emit('ruleClick')">《产品说明》</span>
-      </div>
-      <div class="tips" :style="
-          productJson.length > 0 && productJson[0].proC.s !== ''
-            ? { color: `${productJson[0].proC.s}` }
-            : { color: '#fff' }
-        ">
-        {{ pageData.remarks.privacyText }}
+        <span class="span" :style="productJson.length > 0 && productJson[0].proC.e !== ''? { color: `${productJson[0].proC.e}` }: { color: '#000' }" @click="$emit('hideClick')">《隐私声明》</span>
+        <span class="span" :style="productJson.length > 0 && productJson[0].proC.e !== ''? { color: `${productJson[0].proC.e}` }: { color: '#000' }" @click="$emit('ruleClick')">《产品说明》</span>
       </div>
+      <div class="tips" :style="productJson.length > 0 && productJson[0].proC.s !== ''? { color: `${productJson[0].proC.s}` } : { color: '#fff' }">{{ pageData.remarks.privacyText }}</div>
     </div>
     <!-- 订购按钮 -->
     <div class="buyBox" v-if="pageData.remarks.isBuy === '1'">

purchase_H5/src/components/unifyModal.vue

@@ -32,20 +32,9 @@
         <span class="span" style="color: #fc8940" @click="$emit('hideClick')">《隐私声明》</span>
         <span class="span" style="color: #fc8940" @click="$emit('ruleClick')">《产品说明》</span>
       </div>
-      <div class="text" :style="
-          productJson.length > 0 && productJson[0].rushC.e !== ''
-            ? { color: `${productJson[0].rushC.e}` }
-            : { color: '#000' }
-        ">
-        <span :style="
-            productJson.length > 0 && productJson[0].rushC.e !== ''
-              ? { color: `${productJson[0].rushC.s}` }
-              : { color: '#ea1313' }
-          ">{{ times }}</span>{{
-          pageData.remarks.orderText !== "" && pageData.remarks.orderText
-            ? pageData.remarks.orderText
-            : "用户已抢购成功"
-        }}
+      <div class="text" :style=" productJson.length > 0 && productJson[0].rushC.e !== ''? { color: `${productJson[0].rushC.e}` } : { color: '#000' }">
+        <span :style="productJson.length > 0 && productJson[0].rushC.e !== ''? { color: `${productJson[0].rushC.s}` }: { color: '#ea1313' }">{{ times }}</span>
+        {{pageData.remarks.orderText !== "" && pageData.remarks.orderText? pageData.remarks.orderText : "用户已抢购成功"}}
       </div>
       <div class="tips">
         {{ pageData.remarks.privacyText }}

purchase_H5/src/templates/templateTogether-Col/index.vue

@@ -3,13 +3,13 @@
   <div id="temp" class="tempalteTogetherColor" :style="pageData.mainProduct.bgColor !== null &&pageData.mainProduct.bgColor.length > 0 ? { backgroundColor: pageData.mainProduct.bgColor[0] }: { backgroundColor: '#000' }">
     <div class="bannerBox" @click="bannerClick">
       <!-- 底层banner -->
-      <img class="banner" v-if="pageData.mainProduct.bannerPics[0]" :class="productJson.length>0 &&productJson[0].dongHua &&productJson[0].dongHua=='1'?'cartoon1':''" :src="imgUrl + pageData.mainProduct.bannerPics[0]" alt="" />
+      <img class="banner" v-if="pageData.mainProduct.bannerPics[0] && indexNum>=0" :class="productJson.length>0 &&productJson[0].dongHua &&productJson[0].dongHua=='1'?'cartoon1':''" :src="imgUrl + pageData.mainProduct.bannerPics[0]" alt="" />
       <!-- json动图 -->
       <div class="svgBanner">
         <div id="lottie_box"></div>
       </div>
       <!-- 上层png -->
-      <div class="banner2" :class="productJson.length>0 &&productJson[0].dongHua && productJson[0].dongHua=='1'?'cartoon2':''" v-if="pageData.mainProduct.bannerPics[2]&& pageData.mainProduct.bannerPics[2]!==''">
+      <div class="banner2" :class="productJson.length>0 &&productJson[0].dongHua && productJson[0].dongHua=='1'?'cartoon2':''" v-if="pageData.mainProduct.bannerPics[2]&& pageData.mainProduct.bannerPics[2]!=='' && indexNum>=0">
         <img :src="imgUrl + pageData.mainProduct.bannerPics[2]" alt="" />
       </div>
       <!-- 顶层png/gif -->
@@ -197,7 +197,10 @@ export default {
   },
   methods: {
     async productClick (id, index) {
-      this.indexNum = index
+      this.indexNum = -1
+      setTimeout(() => {
+        this.indexNum = index;
+      }, 1)
       if (this.pageData.channl.edition && this.pageData.channl.edition === '1') {
         let info = await detMainProduct({ productId: id })
         let viceProduct = this.pageData.viceJson
@@ -323,7 +326,6 @@ export default {
           this.$store.commit("setPageData", this.pageData);
         });
       }
-
       this.callSvg()
     },
     extendClick () {

purchase_H5/src/templates/templateTogether-Col/unify.vue

@@ -20,9 +20,9 @@
           </div>
         </van-checkbox>
         <span class="span" :style=" pageData.mainProduct.cacheSeatOne && pageData.mainProduct.cacheSeatOne!==null && pageData.mainProduct.cacheSeatOne[0].proC.e !== ''? { color: `${pageData.mainProduct.cacheSeatOne[0].proC.e}` }: { color: '#000' }" @click="$emit('hideClick')">《隐私声明》</span>
-        <span class="span" :style="pageData.mainProduct.cacheSeatOne > 0 && pageData.mainProduct.cacheSeatOne!==null && pageData.mainProduct.cacheSeatOne[0].proC.e !== ''? { color: `${pageData.mainProduct.cacheSeatOne[0].proC.e}` }: { color: '#000' }" @click="$emit('ruleClick')">《产品说明》</span>
+        <span class="span" :style="pageData.mainProduct.cacheSeatOne && pageData.mainProduct.cacheSeatOne!==null && pageData.mainProduct.cacheSeatOne[0].proC.e !== ''? { color: `${pageData.mainProduct.cacheSeatOne[0].proC.e}` }: { color: '#000' }" @click="$emit('ruleClick')">《产品说明》</span>
       </div>
-      <div class="tips" :style="pageData.mainProduct.cacheSeatOne > 0 && pageData.mainProduct.cacheSeatOne!==null && pageData.mainProduct.cacheSeatOne[0].proC.s !== ''? { color: `${pageData.mainProduct.cacheSeatOne[0].proC.s}` }: { color: '#fff' }">
+      <div class="tips" :style="pageData.mainProduct.cacheSeatOne && pageData.mainProduct.cacheSeatOne!==null && pageData.mainProduct.cacheSeatOne[0].proC.s !== ''? { color: `${pageData.mainProduct.cacheSeatOne[0].proC.s}` }: { color: '#fff' }">
         {{ pageData.remarks.privacyText }}
       </div>
     </div>
@@ -94,7 +94,7 @@ export default {
         task: null,
       },
       checked: false,
-      times: 0,
+      // times: 0,
       loginForm: {
         phone: "",
         vcode: "",
@@ -107,6 +107,7 @@ export default {
   props: {
     pageData: Object,
     isBuy: String,
+
   },
   created () {
     if (this.pageData.remarks.privacy && this.pageData.remarks.privacy !== "" && this.pageData.remarks.privacy !== null) {
@@ -114,11 +115,11 @@ export default {
         this.checked = true;
       }
     }
-    let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
-    let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
-    let now = new Date().getTime();
-    let times = (now - 1600476800000) / 180000;
-    this.times = String(Math.ceil(times * add) + start);
+    // let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
+    // let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
+    // let now = new Date().getTime();
+    // let times = (now - 1600476800000) / 180000;
+    // this.times = String(Math.ceil(times * add) + start);
     if (
       this.pageData.strategyInfo.viceProductStrategyList !== null &&
       this.pageData.strategyInfo.viceProductStrategyList.length > 0

purchase_H5/src/templates/templateTogether/index.vue

@@ -3,13 +3,13 @@
     <div class="bannerBox" @click="bannerClick">
       <!-- 底层banner -->
 
-      <img class="banner" v-if="pageData.mainProduct.bannerPics[0]" :class="productJson.length>0&&productJson[0].dongHua&& productJson[0].dongHua=='1'?'cartoon1':''" :src="imgUrl + pageData.mainProduct.bannerPics[0]" alt="" />
+      <img class="banner" v-if="pageData.mainProduct.bannerPics[0] && indexNum>=0" :class="productJson.length>0&&productJson[0].dongHua&& productJson[0].dongHua=='1'?'cartoon1':''" :src="imgUrl + pageData.mainProduct.bannerPics[0]" alt="" />
       <!-- json动图 -->
       <div class="svgBanner">
         <div id="lottie_box"></div>
       </div>
       <!-- 上层png -->
-      <div class="banner2" :class="productJson[0].dongHua && productJson[0].dongHua=='1'?'cartoon2':''" v-if="pageData.mainProduct.bannerPics[2]&& pageData.mainProduct.bannerPics[2]!==''">
+      <div class="banner2" :class="productJson[0].dongHua && productJson[0].dongHua=='1'?'cartoon2':''" v-if="pageData.mainProduct.bannerPics[2]&& pageData.mainProduct.bannerPics[2]!=='' && indexNum>=0">
         <img :src="imgUrl + pageData.mainProduct.bannerPics[2]" alt="" />
       </div>
       <!-- 顶层png/gif -->
@@ -62,13 +62,9 @@
         pageData.remarks.attestation === 3 ||
         pageData.remarks.attestation === 4 ||
         pageData.remarks.attestation === 5
-      " @btnClick="btnUnify" :pageData="pageData" :isBuy="isBuy" @hideClick="showConceal = true" @ruleClick="ruleClick" @toBuy="toBuy" @toNewBuy="toNewBuy" :indexNum="indexNum">
+      " @btnClick="btnUnify" :pageData="pageData" :isBuy="isBuy" @hideClick="showConceal = true" @ruleClick="ruleClick" @toBuy="toBuy" @toNewBuy="toNewBuy" :indexNum="indexNum" >
     </unify-modal>
-    <div v-if="
-        pageData.remarks.attestation !== 3 &&
-        pageData.remarks.attestation !== 4 &&
-        pageData.remarks.attestation !== 5
-      ">
+    <div v-if="pageData.remarks.attestation !== 3 &&pageData.remarks.attestation !== 4 && pageData.remarks.attestation !== 5">
       <div class="privacyBox">
         <van-checkbox v-model="checked" checked-color="#fc8940">
           <p style="margin: 0; padding: 0">我已阅读并同意</p>
@@ -77,8 +73,7 @@
         <span class="span" style="color: #fc8940" @click="ruleClick">《产品说明》</span>
       </div>
       <div class="textText" :style="productJson.length > 0  &&productJson[0].rushC.e !== ''? { color: `${productJson[0].rushC.e}` }: { color: '#000' }">
-        <span :style="
-            productJson.length > 0 &&productJson[0].rushC.e !== ''? { color: `${productJson[0].rushC.s}` }: { color: '#ea1313' }">{{ times }}</span>
+        <span :style="productJson&&productJson[0].rushC.e !== ''? { color: `${productJson[0].rushC.s}` }: { color: '#ea1313' }">{{ times }}</span>
         {{pageData.remarks.orderText !== "" && pageData.remarks.orderText? pageData.remarks.orderText: "用户已抢购成功"}}
       </div>
       <div class="tips">
@@ -215,6 +210,7 @@ export default {
       lottie: {},
       imgUrl: process.env.VUE_APP_IMGS_URL,
       times: 0,
+      numberNum: 0,
       showLogin: false,
       showRule: false,
       showTucao: false,
@@ -327,22 +323,12 @@ export default {
       this.showRule = false;
     },
     async productClick (val, index) {
+      this.indexNum = -1
       this.clickCss = index;
       this.pageData.mainProduct.isTreaty = index;
-      this.indexNum = index;
-      if (index !== 0) {
-        let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
-        let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
-        let now = new Date().getTime();
-        let times = (now - 1600476800000) / 200000;
-        this.times = String(Math.ceil(times * add) + start);
-      } else {
-        let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
-        let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
-        let now = new Date().getTime();
-        let times = (now - 1600476800000) / 180000;
-        this.times = String(Math.ceil(times * add) + start);
-      }
+      setTimeout(() => {
+        this.indexNum = index;
+      }, 1)
       if (this.pageData.channl.edition && this.pageData.channl.edition === '1') {
         let info = await detMainProduct({ productId: val })
         let viceProduct = this.pageData.viceJson
@@ -470,6 +456,24 @@ export default {
           this.$store.commit("setPageData", this.pageData);
         });
       }
+
+      if (index === 0) {
+        let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
+        let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
+        let now = new Date().getTime();
+        let times = (now - 1600476800000) / 180000;
+        this.times = String(Math.ceil(times * add) + start);
+        this.numberNum = String(Math.ceil(times * add) + start);
+
+      } else if (index === 1) {
+        let start = this.pageData.remarks.orderNum && this.pageData.remarks.orderNum !== "" ? Number(this.pageData.remarks.orderNum) : 0;
+        let add = this.pageData.remarks.orderAdd && this.pageData.remarks.orderAdd !== "" ? Number(this.pageData.remarks.orderAdd) : 1;
+        let now = new Date().getTime();
+        let times = (now - 1600476800000) / 200000;
+        this.times = String(Math.ceil(times * add) + start);
+        this.numberNum = String(Math.ceil(times * add) + start);
+      }
+
       if (this.user.userid) {
         await orderList({
           userid: this.user.userid,
@@ -491,7 +495,6 @@ export default {
         });
       }
       this.callSvg()
-
     },
     result (a, b) {
       return (a - b).toFixed(2);
@@ -502,18 +505,6 @@ export default {
     },
     bannerClick () {
       addR.clickBanner();
-      // if (
-      //   this.pageData.remarks.isBuy === "1" &&
-      //   this.sp !== "text" &&
-      //   this.isBuy !== "已订购"
-      // ) {
-      //   if (this.checked === false) {
-      //     this.$toast.fail("请先勾选隐私声明");
-      //   } else {
-      //     addR.clickBanner();
-      //     this.openIframe();
-      //   }
-      // }
     },
     chaxun () {
       addR.clickFollow();

purchase_H5/src/views/members/member001.vue

@@ -48,283 +48,286 @@
       </div>
     </div>
     <div class="hint">显示您的会员领取记录</div>
+    <div class="hint" style="line-height: 20px;">
+      如有疑问可至“联通畅视”小程序—我的—联系客服，或者请拨打4000600611客服电话
+    </div>
   </div>
 </template>
 <script>
-  import {
-    memberList,
-    memberGive
-  } from "../../api";
-  import filter from "../../common/filter";
-  import addR from "../../common/addRecord";
-  export default {
-    data() {
-      return {
-        orderList: [],
-        filter: filter,
-        memberState: 1,
-        itemInfo: {},
-      };
-    },
-    filters: {
-      formatPhone: (phone) => {
-        phone = phone.toString();
-        return phone.substr(0, 3) + "****" + phone.substr(7, 11);
-      },
+import {
+  memberList,
+  memberGive
+} from "../../api";
+import filter from "../../common/filter";
+import addR from "../../common/addRecord";
+export default {
+  data () {
+    return {
+      orderList: [],
+      filter: filter,
+      memberState: 1,
+      itemInfo: {},
+    };
+  },
+  filters: {
+    formatPhone: (phone) => {
+      phone = phone.toString();
+      return phone.substr(0, 3) + "****" + phone.substr(7, 11);
     },
-    computed: {
-      user() {
-        return localStorage.getItem("userid");
-      },
-      phone() {
-        return localStorage.getItem("phone");
-      },
-    },
-    activated() {
-      if (this.$store.state.global.sensors === 0) {
-        this.$sensors.track("pageOpenMember");
-        this.$sensors.track("searchMemberRecord");
-      }
-      document.title = "领取会员";
-      if (!this.user) {
-        this.$toast({
-          type: "fail",
-          message: "非法进入",
-          forbidClick: true,
-          duration: 4000,
-        });
-        setTimeout(() => {
-          window.opener = null;
-          window.open("about:blank", "_top").close();
-        }, 4001);
-      }
+  },
+  computed: {
+    user () {
+      return localStorage.getItem("userid");
     },
-    created() {
-      document.title = "领取会员";
-      this.itemInfo.cpid = this.$route.query.cpid;
-      this.itemInfo.spid = this.$route.query.spid;
-      this.itemInfo.isCompositeProduct = Number(
-        this.$route.query.isCompositeProduct
-      );
-      this.itemInfo.activeType = this.$route.query.activeType;
-      this.itemInfo.productName = this.$route.query.productName;
-      if (
-        this.itemInfo.isCompositeProduct === 0 ||
-        this.itemInfo.isCompositeProduct === null
-      ) {
-        this.getData();
-      } else if (this.itemInfo.isCompositeProduct === 1) {
-        this.getMemberList();
-      }
+    phone () {
+      return localStorage.getItem("phone");
     },
-    methods: {
-      getData() {
-        this.orderList = [];
-        let {
-          cpid,
-          spid,
-          isCompositeProduct,
-          activeType
-        } = this.itemInfo;
-        memberList({
-            userid: this.user,
-            cpid,
-            spid,
-            isCompositeProduct,
-            activeType,
-          })
-          .then((res) => {
-            if (res.code == 10000) {
-              let list = [];
-              for (var i = 0; i < res.data.length; i++) {
-                if (
-                  res.data[i].resultcode == "9083" ||
-                  res.data[i].resultcode == "0"
-                ) {
-                  list.push(res.data[i]);
-                }
+  },
+  activated () {
+    if (this.$store.state.global.sensors === 0) {
+      this.$sensors.track("pageOpenMember");
+      this.$sensors.track("searchMemberRecord");
+    }
+    document.title = "领取会员";
+    if (!this.user) {
+      this.$toast({
+        type: "fail",
+        message: "非法进入",
+        forbidClick: true,
+        duration: 4000,
+      });
+      setTimeout(() => {
+        window.opener = null;
+        window.open("about:blank", "_top").close();
+      }, 4001);
+    }
+  },
+  created () {
+    document.title = "领取会员";
+    this.itemInfo.cpid = this.$route.query.cpid;
+    this.itemInfo.spid = this.$route.query.spid;
+    this.itemInfo.isCompositeProduct = Number(
+      this.$route.query.isCompositeProduct
+    );
+    this.itemInfo.activeType = this.$route.query.activeType;
+    this.itemInfo.productName = this.$route.query.productName;
+    if (
+      this.itemInfo.isCompositeProduct === 0 ||
+      this.itemInfo.isCompositeProduct === null
+    ) {
+      this.getData();
+    } else if (this.itemInfo.isCompositeProduct === 1) {
+      this.getMemberList();
+    }
+  },
+  methods: {
+    getData () {
+      this.orderList = [];
+      let {
+        cpid,
+        spid,
+        isCompositeProduct,
+        activeType
+      } = this.itemInfo;
+      memberList({
+        userid: this.user,
+        cpid,
+        spid,
+        isCompositeProduct,
+        activeType,
+      })
+        .then((res) => {
+          if (res.code == 10000) {
+            let list = [];
+            for (var i = 0; i < res.data.length; i++) {
+              if (
+                res.data[i].resultcode == "9083" ||
+                res.data[i].resultcode == "0"
+              ) {
+                list.push(res.data[i]);
               }
-              this.orderList = list;
             }
-          })
-          .catch((res) => {
-            this.$toast(res.message);
-            console.warn(res);
-          });
-        this.pageData;
-      },
-      getMemberList() {
-        let {
-          cpid,
-          spid,
-          isCompositeProduct,
-          activeType
-        } = this.itemInfo;
-        memberList({
-            userid: this.user,
-            cpid,
-            spid,
-            isCompositeProduct,
-            activeType,
-          })
-          .then((res) => {
-            if (res.code === 10000) {
-              for (var i = 0; i < res.data.length; i++) {
-                if (res.data[i].resultcode !== "9087") {
-                  this.memberState = 1;
-                } else {
-                  this.memberState = 0;
-                }
+            this.orderList = list;
+          }
+        })
+        .catch((res) => {
+          this.$toast(res.message);
+          console.warn(res);
+        });
+      this.pageData;
+    },
+    getMemberList () {
+      let {
+        cpid,
+        spid,
+        isCompositeProduct,
+        activeType
+      } = this.itemInfo;
+      memberList({
+        userid: this.user,
+        cpid,
+        spid,
+        isCompositeProduct,
+        activeType,
+      })
+        .then((res) => {
+          if (res.code === 10000) {
+            for (var i = 0; i < res.data.length; i++) {
+              if (res.data[i].resultcode !== "9087") {
+                this.memberState = 1;
+              } else {
+                this.memberState = 0;
               }
             }
-          })
-          .catch((res) => {
-            this.$toast(res.message);
-          });
-      },
-      receiveMember() {
-        let updata = {
-          activeType: this.itemInfo.activeType,
-          userid: this.user,
-          channelKey: localStorage.getItem("key"),
-          isCompositeProduct: 1,
-        };
-        addR.memberClick();
-        memberGive(updata)
-          .then(
-            (res) => {
-              this.getMemberList();
-              addR.memberSuccess();
-              this.$toast("领取成功");
-            },
-            (response) => {
-              addR.memberFail(response);
-              this.$toast(response.message);
-            }
-          )
-          .catch((res) => {
-            this.$toast(res.message);
-          });
-      },
-      giveMember(item) {
-        let updata = {
-          activeType: item.activeType,
-          userid: this.user,
-          channelKey: localStorage.getItem("key"),
-          isCompositeProduct: this.itemInfo.isCompositeProduct,
-        };
-        addR.memberClick();
-        memberGive(updata)
-          .then(
-            (res) => {
-              this.getData();
-              addR.memberSuccess();
-              this.$toast("领取成功");
-            },
-            (response) => {
-              addR.memberFail(response);
-              this.$toast(response.message);
-            }
-          )
-          .catch((res) => {
-            console.log(res);
-          });
-      },
+          }
+        })
+        .catch((res) => {
+          this.$toast(res.message);
+        });
     },
-    beforeRouteLeave(to, from, next) {
-      // 销毁组件，避免通过vue-router再次进入时，仍是上次的history缓存的状态
-      this.$destroy(true);
-      next();
+    receiveMember () {
+      let updata = {
+        activeType: this.itemInfo.activeType,
+        userid: this.user,
+        channelKey: localStorage.getItem("key"),
+        isCompositeProduct: 1,
+      };
+      addR.memberClick();
+      memberGive(updata)
+        .then(
+          (res) => {
+            this.getMemberList();
+            addR.memberSuccess();
+            this.$toast("领取成功");
+          },
+          (response) => {
+            addR.memberFail(response);
+            this.$toast(response.message);
+          }
+        )
+        .catch((res) => {
+          this.$toast(res.message);
+        });
+    },
+    giveMember (item) {
+      let updata = {
+        activeType: item.activeType,
+        userid: this.user,
+        channelKey: localStorage.getItem("key"),
+        isCompositeProduct: this.itemInfo.isCompositeProduct,
+      };
+      addR.memberClick();
+      memberGive(updata)
+        .then(
+          (res) => {
+            this.getData();
+            addR.memberSuccess();
+            this.$toast("领取成功");
+          },
+          (response) => {
+            addR.memberFail(response);
+            this.$toast(response.message);
+          }
+        )
+        .catch((res) => {
+          console.log(res);
+        });
     },
-  };
+  },
+  beforeRouteLeave (to, from, next) {
+    // 销毁组件，避免通过vue-router再次进入时，仍是上次的history缓存的状态
+    this.$destroy(true);
+    next();
+  },
+};
 </script>
 <style lang="scss">
-  .member001 {
-    min-height: 100vh;
-    background-color: #f8f9fc;
+.member001 {
+  min-height: 100vh;
+  background-color: #f8f9fc;
+
+  .header {
+    box-sizing: border-box;
+    padding: 0 60px;
+    height: 85px;
+    line-height: 85px;
+    font-size: 32px;
+    font-weight: bold;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .img {
+      width: 48px;
+      height: 38px;
+    }
+  }
 
-    .header {
-      box-sizing: border-box;
+  .group {
+    padding-top: 40px;
+
+    .month {
       padding: 0 60px;
-      height: 85px;
-      line-height: 85px;
+      line-height: 92px;
       font-size: 32px;
-      font-weight: bold;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .img {
-        width: 48px;
-        height: 38px;
-      }
+      font-weight: 500;
+      color: #999999;
     }
 
-    .group {
-      padding-top: 40px;
+    .order {
+      padding: 40px 60px;
+      background-color: #fff;
 
-      .month {
-        padding: 0 60px;
-        line-height: 92px;
-        font-size: 32px;
-        font-weight: 500;
-        color: #999999;
+      .inner {
+        height: 80px;
+        border-bottom: 0.5px solid #cacaca;
+        padding-right: 60px;
       }
 
-      .order {
-        padding: 40px 60px;
-        background-color: #fff;
+      &:last-of-type .inner {
+        border-bottom: none;
+      }
 
-        .inner {
-          height: 80px;
-          border-bottom: 0.5px solid #cacaca;
-          padding-right: 60px;
-        }
+      .title-box {
+        font-size: 36px;
+        font-weight: bold;
+        color: #000000;
+        line-height: 36px;
+        display: flex;
+        justify-content: space-between;
 
-        &:last-of-type .inner {
-          border-bottom: none;
+        .title {
+          max-width: 450px;
         }
 
-        .title-box {
-          font-size: 36px;
-          font-weight: bold;
-          color: #000000;
-          line-height: 36px;
-          display: flex;
-          justify-content: space-between;
-
-          .title {
-            max-width: 450px;
-          }
-
-          .isMem {
-            color: #909090;
-          }
+        .isMem {
+          color: #909090;
         }
+      }
 
-        .time {
-          margin-top: 14px;
-          font-size: 24px;
-          font-weight: 400;
-          color: #0e0e0e;
-        }
+      .time {
+        margin-top: 14px;
+        font-size: 24px;
+        font-weight: 400;
+        color: #0e0e0e;
       }
     }
+  }
 
-    .hint {
-      line-height: 94px;
-      text-align: center;
-      font-size: 24px;
-      font-weight: 400;
-      color: #999999;
-    }
+  .hint {
+    line-height: 94px;
+    text-align: center;
+    font-size: 24px;
+    font-weight: 400;
+    color: #999999;
+  }
 
-    .receiveMember {
-      font-size: 40px;
-      font-weight: bold;
-      color: #0e0e0e;
-      text-align: center;
-      text-decoration: underline;
-    }
+  .receiveMember {
+    font-size: 40px;
+    font-weight: bold;
+    color: #0e0e0e;
+    text-align: center;
+    text-decoration: underline;
   }
+}
 </style>

purchase_ao/.env.devNew

@@ -6,3 +6,5 @@ ENV = 'development'
 VUE_APP_BASE_API = 'http://39.103.199.78:8585'
 VUE_APP_BASE_IMG_URL = 'http://39.103.199.78:8181/'
 VUE_APP_BASE_IMG_API = 'http://39.103.199.78:8181/upload'
+#ifream 引入地址
+VUE_APP_BASE_IFURL = 'http://localhost:8081/mobile.html#/'

purchase_ao/.env.production

@@ -8,3 +8,5 @@ VUE_APP_BASE_API = 'https://operation.mige.tv/a/proapi'
 VUE_APP_BASE_IMG_URL = 'https://operation.mige.tv/a/files/'
 VUE_APP_BASE_IMG_API = 'https://operation.mige.tv/a/upload/file/uploadFile'
 
+#ifream 引入地址
+VUE_APP_BASE_IFURL = 'https://operation.mige.tv/a/mobile.html#/'

purchase_ao/.env.staging

@@ -10,3 +10,5 @@ VUE_APP_BASE_API = 'https://operationimg.mige.tv/TJtest/host/api'
 VUE_APP_BASE_IMG_URL = 'https://operation.mige.tv/TJtest/files/'
 VUE_APP_BASE_IMG_API = 'https://operation.mige.tv/TJtest/upload/file/uploadFile'
 
+#ifream 引入地址
+VUE_APP_BASE_IFURL = 'https://operation.mige.tv/TJtest/mobile.html#/'

purchase_ao/src/views/strategy/add.vue

@@ -23,7 +23,7 @@
         <div class="main">
           <!-- 基础管理 -->
           <div class="info" v-if="activeName==='0'">
-            <el-form size="small" ref="form" label-width="100px" style="width:65%">
+            <el-form :model="form" size="small" ref="form" label-width="100px" style="width:65%">
               <el-form-item>
                 <template slot="label">
                   <el-tooltip content="当前策略名称" placement="top">
@@ -782,7 +782,7 @@ export default {
       ifreamSrc: "",
       imgapi: process.env.VUE_APP_BASE_IMG_API, //上传图片地址
       activeName: '0',
-      collapseVal: ['0', '1', '4'],
+      collapseVal: [],
       loading: true,
       form: {
         activityLogo: "", //活动logo
@@ -942,7 +942,7 @@ export default {
     },
     // 点击预览
     preview () {
-      this.ifreamSrc = 'http://localhost:8081/mobile.html#/'
+      this.ifreamSrc = process.env.VUE_APP_BASE_IFURL
       setTimeout(() => {
         let ifream = document.getElementById('ifreamId')
         const iframeWin = ifream.contentWindow
@@ -1004,12 +1004,24 @@ export default {
           post('/strategytemplate/update/' + id, this.form).then(res => {
             if (res.code === 10000) {
               this.$message.success('编辑成功!')
-              // setTimeout(() => {
-              //   this.$router.go(0)
-              // }, 1000)
+              setTimeout(() => {
+                this.$router.go(0)
+              }, 1000)
             }
           })
         } else {
+          if (this.form.strategyName === '') {
+            this.$message.error('策略名称不能为空')
+            return false
+          }
+          if (this.form.primaryProductId === '') {
+            this.$message.error('主产品不能为空')
+            return false
+          }
+          if (this.form.templateId === '') {
+            this.$message.error('模板不能为空')
+            return false
+          }
           post('/strategytemplate/create', this.form).then(res => {
             if (res.code === 10000) {
               this.$message.success('新增成功!')
@@ -1026,6 +1038,7 @@ export default {
               }
             }
           })
+
         }
       })
     },