铸源星,能量,装修三列改动

.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # www.shop.xyz
-# VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
-VUE_APP_BASE_API = 'http://test.tropjoin.com'
+VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
+# VUE_APP_BASE_API = 'http://testg.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
 # socket 连接地址

src/components/mobilePage/home_goods_list.vue

@@ -241,7 +241,7 @@
               </div>
               <div class="info">
                 <div class="hd">
-                  <div class="title line1" v-if="titleShow">
+                  <div class="title line2" v-if="titleShow">
                     {{ item.store_name }}
                   </div>
                 </div>
@@ -960,6 +960,7 @@ export default {
         width: 31.6%;
         margin-right: 8px;
         overflow: hidden;
+        background: #fff;
         &:nth-child(3n) {
           margin-right: 0;
         }

src/views/marketing/integral/log/index.vue

@@ -23,7 +23,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
+    <!-- <cards-data v-if="cardLists.length>0" :card-lists="cardLists" /> -->
     <el-card>
       <div class="mb20">
         <el-button size="small" type="primary" @click="exports">导出</el-button>
@@ -31,14 +31,14 @@
       <el-table v-loading="listLoading" :data="tableData.data" size="small">
         <el-table-column prop="bill_id" label="ID" min-width="50" />
         <el-table-column label="用户昵称" prop="nickname" min-width="150" />
-        <el-table-column label="积分标题" prop="title" min-width="120" />
-        <el-table-column label="积分变动" prop="number" min-width="90">
+        <el-table-column label="铸源星标题" prop="title" min-width="120" />
+        <el-table-column label="铸源星变动" prop="number" min-width="90">
             <template slot-scope="scope">
                 <span v-if="scope.row.pm==1" style="color: #ff3b30;">+{{scope.row.number}}</span>
                 <span v-if="scope.row.pm==0" style="color: #82e493;">-{{scope.row.number}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="当前积分额度" prop="balance" min-width="90" />
+        <el-table-column label="当前铸源星额度" prop="balance" min-width="90" />
         <el-table-column prop="mark" label="备注" min-width="150" />
         <el-table-column prop="create_time" label="添加时间" min-width="90" />
       </el-table>

src/views/product/productExamine/index.vue

@@ -932,6 +932,10 @@ const proOptions = [
     name: "全折扣秒杀",
     value: "is_discount",
   },
+  {
+    name: "能量",
+    value: "is_energy",
+  },
   // {
   //   name: "活动专区",
   //   value: "is_activities",
@@ -1006,6 +1010,10 @@ export default {
           name: "全折扣秒杀",
           value: "discount",
         },
+        {
+          name: "能量",
+          value: "is_energy",
+        },
         // {
         //   name: "活动专区",
         //   value: "activity",
@@ -1018,6 +1026,7 @@ export default {
         is_best: 0,
         is_new: 0,
         is_benefit: 0,
+        is_energy: 0,
         ficti: 0,
         is_ficti: "",
         content: "",
@@ -1369,6 +1378,7 @@ export default {
             is_best: info.is_best,
             is_new: info.is_new,
             is_benefit: info.is_benefit,
+            is_energy: info.is_energy,
             ficti: info.ficti,
             content: info.content,
             store_name: info.store_name,
@@ -1387,6 +1397,7 @@ export default {
           if (info.is_hot === 1) this.checkboxGroup.push("is_hot");
           if (info.is_best === 1) this.checkboxGroup.push("is_best");
           if (info.is_new === 1) this.checkboxGroup.push("is_new");
+          if (info.is_energy === 1) this.checkboxGroup.push("is_energy");
           this.fullscreenLoading = false;
         })
         .catch((res) => {
@@ -1447,6 +1458,10 @@ export default {
         ? (this.formValidate.is_discount = 1)
         : (this.formValidate.is_discount =
             0 && this.checkboxGroup.remove("is_discount"));
+      this.checkboxGroup.includes("is_energy")
+        ? (this.formValidate.is_energy = 1)
+        : (this.formValidate.is_energy =
+            0 && this.checkboxGroup.remove("is_energy"));
     },
     onChangeRecommend() {
       this.recommendForm.is_benefit = Number(
@@ -1461,6 +1476,9 @@ export default {
       this.recommendForm.is_hot = Number(
         this.recommendGroup.includes("is_hot")
       );
+      this.recommendForm.is_energy = Number(
+        this.recommendGroup.includes("is_energy")
+      );
     },
     handleClose() {
       this.dialogVisible = false;

src/views/promoter/order/orderDetails.vue

@@ -136,7 +136,7 @@
                   </div>
                 </li>
                 <li class="item">
-                  <div>上级成长值：</div>
+                  <div>邀请人成长值：</div>
                   <div class="value">
                     {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
                     <em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>