jufubao-admin-library 1.1.227 → 1.1.230

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -72,9 +72,9 @@
           <div style="margin-top: 20px;">
             <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
               <h3 style="font-size: 16px; font-weight: 500; margin: 0;">规格调价</h3>
-              <el-button 
-                type="primary" 
-                size="small" 
+              <el-button
+                type="primary"
+                size="small"
                 @click="handleAddSkuAdjust"
               >新增规格调价</el-button>
             </div>
@@ -90,6 +90,11 @@
                 label="规格"
                 min-width="120"
               />
+              <el-table-column
+                prop="product_sku"
+                label="规格ID"
+                min-width="120"
+              />
               <el-table-column
                 prop="unit_label"
                 label="调价方式"
@@ -253,7 +258,7 @@
       @onConfirm="handlePublicSet"
     >
       <el-form ref="setForm" :model="setForm" :rules="setRules" label-width="120px">
-        <el-form-item prop="product_name" label="商品名称"> 
+        <el-form-item prop="product_name" label="商品名称">
           {{ dialogRow['product_name'] }}
         </el-form-item>
         <el-form-item prop="public" label="是否公开">
@@ -273,7 +278,7 @@
             <el-checkbox v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item prop="spider_url" label="产品来源地址"> 
+        <el-form-item prop="spider_url" label="产品来源地址">
           <el-input v-model="setForm.spider_url" placeholder="请输入"></el-input>
         </el-form-item>
         <div v-if="setForm.skus.length">
@@ -403,7 +408,7 @@ export default {
           // 重新计算上调/下调值
           let unit = 'moneyValue';
           if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
-          
+
           const skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
           if (skuData && skuData.prices[n]) {
             let price = skuData.prices[n];
@@ -455,7 +460,7 @@ export default {
       }
     },
   },
- 
+
   data () {
     return {
       showCount: false,
@@ -1221,7 +1226,7 @@ export default {
           ele: 'slot',
           slot:'showVipSelectPrice'
         },
-        
+
         this.isShowVipSet&&params.vip_unit==='ratio'&& {
           label: "",
           ele: 'slot',
@@ -1416,17 +1421,17 @@ export default {
       this.$refs['skuDesireForm'].validate((valid) => {
         if (valid) {
           if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base || !this.skuDesireForm.price) return false;
-          
+
           let unit = 'moneyValue';
           if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
-          
+
           const skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
           if (!skuData || !skuData.prices[this.skuAdjustValue.base]) return false;
-          
+
           let price = skuData.prices[this.skuAdjustValue.base];
           let value = this.$xdHelper.divisionFloatNumber(this.$xdHelper.multiplyFloatNumber(this.skuDesireForm.price, 100) - price, price);
           this.skuAdjustValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
-          
+
           this.getSkuAdjustForm(this.skuAdjustValue);
           this.skuAdjustKey = Date.now();
           this.showSkuDesire = false;
@@ -1441,12 +1446,12 @@ export default {
       if(unit === 'ratio') value = Number(ratioValue);
       if(unit === 'money') value = Number(moneyValue);
       if(unit === 'fixed') value = Number(moneyValue);
-      
+
       let vip_value = 0;
       if(vip_unit === 'ratio') vip_value = Number(vipRatioValue);
       if(vip_unit === 'money') vip_value = Number(vipMoneyValue);
       if(vip_unit === 'fixed') vip_value = Number(vipMoneyValue);
-      
+
       const formula = {
         sale_price: {
           unit,
@@ -1468,12 +1473,12 @@ export default {
           allow_below_cost: vip_allow_below_cost ?? false,
         };
       }
-      
+
       const params = {
         product_id,
         formula
       };
-      
+
       // 添加规格调价信息到skus数组
       if(this.skuAdjustList && this.skuAdjustList.length > 0){
         params.skus = this.skuAdjustList.map(item => {
@@ -1514,7 +1519,7 @@ export default {
           };
         });
       }
-      
+
       return params;
     },
 
@@ -1840,7 +1845,7 @@ export default {
       if (params.unit === 'money' && params.ratioValue !== '') {
         this.skuAdjustValue.ratioValue = '';
       }
-      
+
       this.skuAdjustForm = [
         {
           label: '商品规格:',
@@ -1900,7 +1905,7 @@ export default {
           ele: 'slot',
           slot: 'showSkuOriginalPrice'
         },
-      
+
         this.skuAdjustValue.unit==='ratio' && {
           keys: Date.now(),
           label: "",

package/library/viewModules/viewsCompany/viewsCompany/list.vue

@@ -343,6 +343,20 @@ export default {
             { required: false, message: "请选择网站地址", trigger: "change" },
           ],
         },
+        {
+          label: '工号验证:',
+          ele: 'xd-radio',
+          valueKey: 'job_number_verify',
+          value: params.job_number_verify || 'N',
+          placeholder: '请选择状态',
+          list: [
+            { "label": "开启", "value": 'Y' },
+            { "label": "关闭", "value": 'N' },
+          ],
+          rules: [
+            { required: true, message: `请选择工号验证状态`, trigger: 'change' },
+          ]
+        },
         {
           label: '客户状态:',
           ele: 'xd-radio-status',
@@ -396,7 +410,8 @@ export default {
           company_name: row.company_name,
           site_id: row.site_id,
           company_status: row.company_status,
-          index_path:row.index_path
+          index_path: row.index_path,
+          job_number_verify: row.job_number_verify,
         };
         if(row.default_entry_page){
           info.default_entry_page = JSON.parse(row.default_entry_page)

package/library/viewModules/viewsThird/viewsThird/list.vue

@@ -452,6 +452,7 @@ export default {
       ],
       openInfoData: null,
       typeData: [],
+      phone_collect_url_data: "",
     };
   },
   async created() {
@@ -686,6 +687,8 @@ export default {
           console.log(res, "sss");
           if (this.searchParams.tabType == 1) {
             this.openDialogForm = res["data"]["open_app_form"];
+            this.phone_collect_url_data = res["data"]["phone_collect_url_data"];
+            console.log(this.phone_collect_url_data, "phone_collect_url_data");
             this.tableHeader = this.insertArrayAt(
               this.headers,
               2,
@@ -1184,7 +1187,7 @@ export default {
                 },
               ],
             },
-            (this.$channelCode==='wenyu_dingdong'||this.$channelCode==='rt_mart'||this.$channelCode==='qxdaojia')&&params.site_id&&{
+            this.phone_collect_url_data==='Y'&&params.site_id&&{
               label: "手机号收集页:",
               ele: "xd-select-site-path",
               className: "input100",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.227",
+  "version": "1.1.230",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {