111

.env.development

@@ -3,9 +3,9 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = 'http://117.50.215.20:20400'
+# VUE_APP_BASE_API = 'http://106.75.49.247:20400'
-# VUE_APP_BASE_API = 'https://yruibao.com'
+VUE_APP_BASE_API = 'https://yruibao.com/admin'
-VUE_APP_BASE_API = 'http://106.75.49.247:20400'
+# VUE_APP_BASE_API = 'http://192.168.2.26:20401'
 
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

.env.production

@@ -3,6 +3,6 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-# VUE_APP_BASE_API = 'http://117.50.215.20:20400'
+# VUE_APP_BASE_API = 'http://106.75.49.247:20400'
-# VUE_APP_BASE_API = 'https://yruibao.com'
+VUE_APP_BASE_API = 'https://yruibao.com/admin'
-VUE_APP_BASE_API = 'http://106.75.49.247:20400'
+# VUE_APP_BASE_API = 'http://192.168.2.26:20401'

src/api/channel.js

@@ -118,6 +118,7 @@ export function UpdateChannel(pram) {
     price: pram.price,
     status: pram.status,
     remark: pram.remark,
+    storeHide:pram.storeHide,
   };
   return request({
     url: '/admin/channel/update',

src/views/channel/creatChannel.vue

@@ -32,6 +32,15 @@
           :inactive-value="false"
         />
       </el-form-item>
+      <el-form-item label="渠道商品">
+        <el-switch
+          v-model="channelInfo.storeHide"
+          active-text="展示"
+          inactive-text="隐藏"
+          :active-value="true"
+          :inactive-value="false"
+        />
+      </el-form-item>
       <el-form-item label="备注：" prop="remark">
         <el-input type="textarea" v-model="channelInfo.remark"></el-input>
       </el-form-item>
@@ -58,6 +67,8 @@ const obj = {
   status: true,
   remark: '',
   id: null,
+  storeHide:true,
+
 };
 export default {
   name: 'CreatChannel',
@@ -111,13 +122,16 @@ export default {
            // this.channelInfo.downPaymentPercent = (this.channelInfo.downPaymentPercentStr)/100;
           console.log("----------- "+JSON.stringify(this.channelInfo));
           let data = {
+            storeHide: this.channelInfo.storeHide,
             name: this.channelInfo.name,
             url: this.channelInfo.url,
             price: this.channelInfo.price,
             status: this.channelInfo.status,
             remark: this.channelInfo.remark,
-            id: this.channelInfo.id
+            id: this.channelInfo.id,
+           
           };
+          console.log(data,' storeHide: this.channelInfo.storeHide,');
           this.channelInfo.id
             ? UpdateChannel(data)
                 .then((res) => {
@@ -137,6 +151,7 @@ export default {
                   this.handleClose();
                   this.formValidate = Object.assign({}, obj);
                   this.$parent.getList();
+                  clog
                 })
                 .catch(() => {
                   this.loading = false;

src/views/channel/index.vue

@@ -28,13 +28,13 @@
       </el-table>
       <el-table v-loading="listLoading" :data="listData.list" style="width: 100%" size="mini">
         <el-table-column prop="name" label="名称" min-width="50"  align="center"/>
-        <el-table-column prop="createTime" label="添加日期" min-width="50"  align="center"/>
+        <el-table-column prop="createTime" label="添加日期" min-width="100"  align="center"/>
         <el-table-column prop="totalClickNum" label="总点击" min-width="50"  align="center"/>
         <el-table-column prop="totalRegisterNum" label="总注册" min-width="50"  align="center"/>
         <!-- <el-table-column prop="totalOrderNum" label="总订单(金额/数量)" min-width="120" /> -->
         <el-table-column prop="totalOrderNum" label="总订单(金额/数量)" min-width="100"  align="center">
           <template slot-scope="scope" >
-           <div class="cont" style="width: 100px;">
+           <div class="cont" >
             {{scope.row. totalAmount}}    元/  {{  scope.row. totalOrderNum}}
           </div>
           </template> 
@@ -45,12 +45,12 @@
        
         <el-table-column prop="todayOrderNum" label="今日订单(金额/数量)" min-width="100"  align="center">
           <template slot-scope="scope" >
-           <div class="cont" style="width: 100px;">
+           <div class="cont" >
             {{scope.row.todayOrderAmount}}    元/  {{  scope.row.todayOrderNum}}
           </div>
           </template> 
          </el-table-column>
-        <el-table-column prop="todayConversionRatio" label="今日转化率" min-width="50" />
+        <el-table-column prop="todayConversionRatio" label="今日转化率" min-width="50" align="center"/>
         <el-table-column prop="remark" label="备注 " min-width="50" />
       
         <!-- <el-table-column prop="price" label="单价（元）" min-width="100" /> -->
@@ -272,6 +272,11 @@ export default {
       navigator.clipboard.writeText(url)
     .then(() => {
       console.log('URL已成功复制到剪贴板');
+      this.$message({
+          message: '复制成功',
+          type: 'success',
+          center:true
+        });
     })
     .catch(err => {
       console.error('无法复制URL到剪贴板:', err);

src/views/dashboard/components/gridMenu.vue

@@ -143,6 +143,7 @@ export default {
         }
       });
       return arr;
+     
     },
   },
   mounted() {

src/views/dashboard/index.vue

@@ -39,7 +39,7 @@ export default {
       this.authStatus = Cache.local.has('auth-information') ? Cache.local.getJSON('auth-information') : null;
       this.notInformation = Cache.local.has('not-information') ? Cache.local.getJSON('not-information') : null;
       if (!this.authStatus) {
-        this.getUniq();
+        // this.getUniq();
       }
     }
   },

src/views/marketing/bargain/bargainGoods/creatBargain.vue

@@ -564,6 +564,7 @@ export default {
             productId: res.id,
             giveIntegral: res.giveIntegral,
             ficti: res.ficti,
+            isHide:res.isHide,
             startTime: res.startTime || '',
             stopTime: res.stopTime || '',
             timeVal: [],
@@ -572,6 +573,7 @@ export default {
             bargainNum: 2,
             peopleNum: 1,
           };
+          console.log( this.formValidate,' this.formValidate this.formValidate');
           if (res.specType) {
             res.attrValue.forEach((row) => {
               row.quota = row.stock;
@@ -617,6 +619,7 @@ export default {
             productId: res.productId,
             giveIntegral: res.giveIntegral,
             ficti: res.ficti,
+            isHide:res.isHide,
             startTime: res.startTime || '',
             stopTime: res.stopTime || '',
             timeVal:

src/views/order/orderSend.vue

@@ -310,7 +310,7 @@ export default {
   },
   mounted() {
     this.express = this.expressListNormal;
-    this.getShipmentExpress();
+    // this.getShipmentExpress();
   },
   methods: {
     checkPermi,

src/views/store/creatStore/index.vue

@@ -168,6 +168,16 @@
                 <el-radio :label="false">默认设置</el-radio>
               </el-radio-group>
             </el-form-item>
+            <el-form-item label="是否隐藏商品：" props="isHide">
+              <el-radio-group
+                v-model="formValidate.isHide"
+                @change="onChangetype(formValidate.isHide)"
+                :disabled="isDisabled"
+              >
+                <el-radio :label="true" class="radio">隐藏</el-radio>
+                <el-radio :label="false">不隐藏</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
           <!-- 多规格添加-->
           <el-col v-if="formValidate.specType && !isDisabled" :span="24" class="noForm">
@@ -642,6 +652,7 @@ const defaultObj = {
   // installmentConfigs:[],
   isHot: false,
   isBest: false,
+  isHide:false,
   tempId: '',
   attrValue: [
     {
@@ -1247,6 +1258,7 @@ export default {
             attrValue: info.attrValue,
             selectRule: info.selectRule,
             isSub: info.isSub,
+            isHide:info.isHide,
             content: this.$selfUtil.replaceImgSrcHttps(info.content),
             // installmentConfigs: info.storeProductInstallmentsList ==null?[]:info.storeProductInstallmentsList,
             // orderType: info.orderType,