2

src/components/coffeeManage/index.vue

@@ -159,6 +159,12 @@
             </template>
           </template>
         </el-table-column>
+        <el-table-column prop="RetailStore" width="100" label="类型">
+          <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.GoodsEduType==1">咖啡券</el-tag>
+            <el-tag type="success" v-if="scope.row.GoodsEduType==2">资产</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="分类">
           <template slot-scope="scope">
             <el-tag
@@ -339,24 +345,6 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="RetailStore" width="100" label="分销商品">
-          <template slot-scope="scope">
-            <el-checkbox
-              v-if="scope.row.SourceGoodsId > 0"
-              :value="scope.row.SourceGoodsId > 0"
-              disabled
-            ></el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column prop="RetailStore" width="100" label="是否分销">
-          <template slot-scope="scope">
-            <el-checkbox
-              v-if="scope.row.RetailStore == 1"
-              :value="scope.row.RetailStore == 1"
-              disabled
-            ></el-checkbox>
-          </template>
-        </el-table-column>
         <el-table-column prop="address" width="250" label="操作">
           <template slot-scope="scope">
             <span
@@ -927,12 +915,11 @@ export default {
       BuyOrderNumState: true,
       hpState: 0,
       FxState: 0,
-      currentUserInfo: {} //当前用户
+      currentUserInfo: {
+        IsKorea:0
+      } //当前用户
     };
   },
-  created() {
-    // this.currentUserInfo = JSON.parse(localStorage.mall_userInfo);
-  },
   methods: {
     //获取是否开启和平返佣
     getHpState() {
@@ -1307,18 +1294,30 @@ export default {
     }
   },
   mounted() {
-    let that=this
-    window.addEventListener("message", function(messageEvent) {
-      let data = messageEvent.data;
-      console.log("收到vue的数据：", JSON.parse(data));
-      window.localStorage.setItem("iframeData", data);
+    
+    let that = this;
+    if (localStorage.getItem("iframeData")) {
       that.getList();
       that.getTree();
       that.getRule();
       that.getHpState();
       that.getFxState();
       that.getSupplierList(); //获取供应商
+    } 
+    window.addEventListener("message", function(messageEvent) {
+        let data = messageEvent.data||'';
+        console.log("收到vue的数据：", data);
+        if(data.indexOf('token')>-1){
+          window.localStorage.setItem("iframeData", data);
+        }
+        that.getList();
+        that.getTree();
+        that.getRule();
+        that.getHpState();
+        that.getFxState();
+        that.getSupplierList(); //获取供应商
     });
+    
   }
 };
 </script>