jufubao-admin-library 1.1.204 → 1.1.206

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -131,9 +131,20 @@
             <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="产品来源地址"> 
+        <div v-if="setForm.skus.length">
+          <el-table :data="setForm.skus" style="width: 100%" border>
+            <el-table-column prop="product_sku_name" label="规格名称" width="120"></el-table-column>
+            <el-table-column prop="spider_url" label="产品来源地址">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.spider_url" placeholder="请输入"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-form-item v-else prop="spider_url" label="产品来源地址"> 
           <el-input v-model="setForm.spider_url" placeholder="请输入"></el-input>
         </el-form-item>
+
       </el-form>
     </xd-dialog>
     <xd-dialog :show.sync="showOpen" title="发票名称设置" width="600px" @onConfirm="handleOpenConfirm">
@@ -409,6 +420,7 @@ export default {
       this.setForm.partner_product_tags = info.data['entity']['partner_product_tags']
       this.setForm.public = info.data['entity']['is_public']
       this.setForm.spider_url = info.data['entity']['spider_url']
+      this.setForm.skus = info.data['entity']['skus']
       this.showPublicSet = true
     }
     //开票设置
@@ -860,6 +872,7 @@ export default {
               is_public: this.setForm.public,
               partner_product_tags:this.setForm.partner_product_tags,
               spider_url:this.setForm.spider_url,
+              skus: this.setForm.skus
             }
           }).then(res => {
             console.log(res)

package/library/pageComponents/modules/JfbProductSku.vue

@@ -159,6 +159,7 @@
           {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
           {"type": "normal", "prop": "product_code", "align": "left", "min-width": 80, "label": "商品编码"},
           {"type": "normal", "prop": "product_bar_code", "align": "left", "min-width": 80, "label": "商品条码"},
+          {"type": "normal", "prop": "spider_url", "align": "left", "min-width": 80, "label": "产品来源地址"},
           {
             type: "operate",
             align: "center",
@@ -190,7 +191,7 @@
       getTableDataFromResponseData(data = []) {
         let list = this.$xdHelper.cloneDeep(data);
         return list.map((item) => {
-          let {specs, stocks, sku_uniq_id, standards,product_sku} = item;
+          let {specs, stocks, sku_uniq_id, standards,product_sku, spider_url} = item;
           let imgStandIndex = standards.findIndex((ss) => ss.image);
           if (imgStandIndex > -1) {
             let imgUrl = standards[imgStandIndex].image;
@@ -226,6 +227,7 @@
             sku_uniq_id,
             product_sku,
             standards,
+            spider_url
           };
         });
       },

package/library/viewModules/viewWalking/schemas/walking.js

@@ -256,6 +256,26 @@ module.exports = {
       role: '',
       method:'put'
     },
+    // #ifdef saas-admin sms-walking
+    {
+      title: '健步走：地图 - 修改点位周期限制',
+      mapFn: "walkingPointPeriodLimit",
+      // #ifdef saas-admin
+      path: '/saas-app-company/v1/walking/x_map/point-period-limit/:id',
+      // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/point-period-limit/:id',
+      // #endif
+      isRule: false,
+      data: {
+        id: ['点位ID', 'string', '必填'],
+        point_period_limit: ['点位周期限制', 'string', '必填'],
+      },
+      disabled: true,
+      role: '',
+      method: 'put'
+    },
+    // #endif
     {
       title: '健步走：地图 - 删除点位',
       mapFn: "walkingPointDelete",

package/library/viewModules/viewWalking/viewWalking/config.vue

@@ -37,6 +37,11 @@
           <span>到达点位颜色:</span>
           <el-color-picker v-model="color" size="small" @change="e => handleColorChange(e)"></el-color-picker>
         </div>
+        <div class="btn-item">
+          <el-tooltip content="在限制周期内未到达，即未完成也按未达到展示。" placement="top">
+            <span class="el-icon-question"></span>
+          </el-tooltip>
+        </div>
       </div>
       <div class="right">
         <el-button type="primary" round size="mini" @click="add">新增点位</el-button>
@@ -55,6 +60,19 @@
         >关闭辅助线</el-button>
       </div>
     </div>
+    <!-- #ifdef saas-admin sms-walking -->
+    <div>
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item label="点位周期限制" required prop="isCycle">
+          <el-radio-group v-model="form.isCycle" @input="handleCycleChange">
+            <el-radio label="Y">开启</el-radio>
+            <el-radio label="N">关闭</el-radio>
+          </el-radio-group>
+          <div style="color: red;">开启后，将限制在指定周期内到达点位才算完成</div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- #endif -->
     <div class="container" :style="containerObjet">
       <div class="content" id="content"></div>
       <div
@@ -86,6 +104,7 @@
           :circle-color="color"
           :site_id="siteId"
           :typeData="typeData"
+          :is-cycle="form.isCycle"
           @onDelete="handleItemDelete"
           @onSubmit="handleItemSubmit"
           v-model="item.model"
@@ -154,8 +173,12 @@ export default {
       yLeft:15.2,
       yHeight: 15.2,
       siteId:'',
-      typeData:[],
-
+      typeData: [],
+      // #ifdef saas-admin sms-walking
+      form:{
+        isCycle:'',
+      }
+      // #endif
     };
   },
   computed:{
@@ -226,12 +249,16 @@ export default {
       'walkingPointColor',//点位颜色
       'walkingPointSize',//点位大小
       'walkingPointDelete',//删除点位
+      // #ifdef saas-admin sms-walking
+      'walkingPointPeriodLimit',//点位周期限制
+      // #endif
     ]),
     getInfo(){
       let loading = Loading.service({});
       this.containerDone = false;
       Promise.all([this.getDetail(),this.getPointList()])
-        .then(([info, list])=>{
+        .then(([info, list]) => {
+          
         let backgroundImage = this.getImageFullPath(info['map_image_url'])
         let pointList = []
         list.map(item=>{
@@ -254,6 +281,7 @@ export default {
           this.color = info['map_point_color'] || '#3498db';
           this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
           this.name = info['map_name'];
+          this.form.isCycle = info['point_period_limit'];
           this.backgroundImage = backgroundImage;
           loading.close()
 
@@ -445,6 +473,22 @@ export default {
         this.$message.error('请至少设置一个点位！')
         return
       }
+      
+      // 检查点位周期限制
+      if(this.form.isCycle === 'Y') {
+        let noPeriodPoints = [];
+        this.dataList.forEach(item => {
+          if(!item.model.period_start_time || !item.model.period_end_time) {
+            noPeriodPoints.push(`点位${item.model.point_total_mileage + 1}`);
+          }
+        });
+        
+        if(noPeriodPoints.length > 0) {
+          this.$message.error(`${noPeriodPoints.join('、')}完成周期需设置`);
+          return;
+        }
+      }
+      
       // let  params = this.getDoneParams();
       let params = {
         // #ifdef admin
@@ -472,6 +516,19 @@ export default {
 
     //获取完成参数
     getDoneParams(){},
+    // #ifdef saas-admin sms-walking
+    // 处理周期限制切换
+    handleCycleChange(value) {
+      this.walkingPointPeriodLimit({
+        id: this.map_id,
+        point_period_limit: value
+      }).then(res => {
+        this.$message.success('点位周期限制设置成功')
+      }).catch(err => {
+        console.log(err, 'err')
+      })
+    },
+    // #endif
 
     //半径改变
     handleRadiusChange(e){

package/library/viewModules/viewWalking/viewWalking/jbz/XdJbzItemScale.vue

@@ -35,6 +35,7 @@
       :show.sync="dialogShow"
       :is-move="true"
       :is-btn="false"
+      width="1000px"
     >
       <xd-base-dynamic-field
         :list="formList"
@@ -122,6 +123,10 @@ export default {
         return []
       }
     },
+    isCycle: {
+      type: String,
+      default: 'N'
+    },
   },
   data(){
     return {
@@ -197,7 +202,16 @@ export default {
           }       
         }
       }
+    },
+    // #ifdef saas-admin sms-walking
+    isCycle: {
+      handler(n,o){
+        if(n&&n!==o){
+          this.initForm(Object.assign({},this.orgFormValue,this.formValue))
+        }
+      }
     }
+    // #endif
   },
   computed: {
     styleObject() {
@@ -217,8 +231,8 @@ export default {
     },
     orgFormValue(){
       let point_position = this.item.point_position;
-      if(typeof point_position === 'string') point_position = JSON.parse(this.item.point_position);
-      return {
+      if(typeof point_position === 'string') point_position = JSON.parse(point_position);
+      let formValue = {
         ...this.item,
         point_image_url: {
           url: this.item.point_image_url
@@ -227,7 +241,14 @@ export default {
         // #ifdef sms-walking saas-admin
         sms_activity_list:[{label:this.item.sms_activity_name,value:this.item.sms_activity_id}]
         // #endif
+      };
+      // 处理完成周期
+      if (this.item.period_start_time && this.item.period_end_time) {
+        // 反显时将秒转换为毫秒
+        formValue.period_start_time = parseInt(this.item.period_start_time) * 1000;
+        formValue.period_end_time = parseInt(this.item.period_end_time) * 1000;
       }
+      return formValue;
     },
   },
   created(){
@@ -539,6 +560,22 @@ export default {
           notice: '单位:里，2里=1公里',
           inline: true
         },
+        // #ifdef saas-admin sms-walking
+        this.isCycle === 'Y' && {
+          label: '完成周期:',
+          ele: 'xd-date-range',
+          valueKey: ['period_start_time', 'period_end_time'],
+          value: params['period_start_time']?[params['period_start_time'],params['period_end_time']]:[],
+          placeholder: ['开始日期', '结束日期'],
+          className: 'input40',
+          format: 'yyyy/MM/dd HH:mm:ss',//时间显示格式
+          formatValue: 'timestamp', //输出时间格式
+          notice: '在周期内兑换的步数才算有效兑换，超过结束时间未达到点位，则算未完成',
+          rules: [
+            {required: true, message: '请选择完成周期', trigger: 'change'},
+          ]
+        },
+        // #endif
         {
           label: '点位知识:',
           ele: 'xd-tinymce',
@@ -581,12 +618,36 @@ export default {
         y: this.changeOffsetY || this.defaultValue.y,
       }
       if(isString) point_position = JSON.stringify(point_position);
+      let period_start_time = '';
+      let period_end_time = '';
+      
+      if (this.formValue.period_start_time) {
+        // 提交时将毫秒转换为秒
+        period_start_time = Math.floor(this.formValue.period_start_time / 1000);
+      } else if (this.orgFormValue.period_start_time) {
+        // 提交时将毫秒转换为秒
+        period_start_time = Math.floor(this.orgFormValue.period_start_time / 1000);
+      }
+      
+      if (this.formValue.period_end_time) {
+        // 提交时将毫秒转换为秒
+        period_end_time = Math.floor(this.formValue.period_end_time / 1000);
+      } else if (this.orgFormValue.period_end_time) {
+        // 提交时将毫秒转换为秒
+        period_end_time = Math.floor(this.orgFormValue.period_end_time / 1000);
+      }
+      
       let params = {
         point_image_url: type==='normal'?this.formValue.point_image_url.url || this.orgFormValue.point_image_url.url:this.orgFormValue.point_image_url.url,
         point_knowledge: type==='normal'?this.formValue.point_knowledge || this.orgFormValue.point_knowledge:this.orgFormValue.point_knowledge,
         point_name: type==='normal'?this.formValue.point_name || this.orgFormValue.point_name:this.orgFormValue.point_name,
         point_total_mileage: type==='normal'?Number( this.formValue.point_total_mileage || this.orgFormValue.point_total_mileage):Number(this.orgFormValue.point_total_mileage),
         point_position:point_position,
+        // 只有当 isCycle 为 Y 时，才提交周期相关字段
+        ...(this.isCycle === 'Y' && {
+          period_start_time: period_start_time,
+          period_end_time: period_end_time,
+        }),
         // #ifdef sms-walking saas-admin
         sms_activity_type: type==='normal'?this.formValue.sms_activity_type || this.orgFormValue.sms_activity_type:this.orgFormValue.sms_activity_type,
         sms_activity_id: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['value']:'':this.orgFormValue.sms_activity_list[0]['value'],

package/library/viewModules/viewsFlashSale/viewsFlashSale/product.vue

@@ -132,6 +132,26 @@
         ></xd-pagination-jfb>
       </div>
     </el-card>
+    <xd-dialog
+      :title="stockTitle"
+      v-if="showStockDialog"
+      :show.sync="showStockDialog"
+      width="500px"
+      @onCancel="handleCancelStock"
+      @onConfirm="handleConfirmStock"
+    >
+      <el-form ref="stockForm" :model="stockForm" :rules="stockRules" label-width="120px">
+        <el-form-item label="秒杀库存数量:" prop="total_stock">
+          <el-input
+            v-model="stockForm.total_stock"
+            placeholder="请输入秒杀库存数量"
+            type="number"
+            min="0"
+            max="99999"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </xd-dialog>
   </div>
 </template>
 
@@ -194,7 +214,7 @@ export default {
         lazy: true,
         lazyLoad(node, resolve) {
           getOptions({
-            server: "product-partner",
+            server: 'product-partner',
             fn: "categories",
             path: "p4",
             params: {
@@ -310,6 +330,35 @@ export default {
       ],
       searchOtherForm: {},
       cityData: [],
+      stockTitle: "",
+      showStockDialog: false,
+      stockForm: {
+        total_stock: '',
+      },
+      stockRules: {
+        total_stock: [
+          { required: true, message: '请输入秒杀库存数量', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              const num = Number(value);
+              if (value === '' || value === null || value === undefined) {
+                callback(new Error('请输入秒杀库存数量'));
+              } else if (isNaN(num)) {
+                callback(new Error('请输入有效的数字'));
+              } else if (num < 0) {
+                callback(new Error('库存数量不能小于0'));
+              } else if (num > 99999) {
+                callback(new Error('库存数量不能超过99999'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
+          }
+        ]
+      },
+      stock_type: "",
+      selectProductIds: [], // 当前选中的商品ID列表（单个或批量）
     };
   },
   computed: {
@@ -364,7 +413,7 @@ export default {
     let cityData = await this.getAllCityList();
     this.cityData = cityData.data.list;
     await getOptions({
-      server: "supplier-partner",
+      server: 'supplier-partner',
       fn: "supplier-channel",
       path: "p1",
       params: {
@@ -387,6 +436,11 @@ export default {
     console.log(setting,'ssss')
     this.initSearchForm();
     await this.getList();
+    this.activityGet({
+      activity_id: this.activity_id
+    }).then(res => {
+      this.stock_type = res.data.stock_type;
+    })
   },
 
   methods: {
@@ -397,6 +451,7 @@ export default {
       "getActivityCodeCount",
       "getPolicyListSetting"
     ]),
+    ...mapActions("flashsale", ["updateStock", "activityGet"]),
 
     /**
      * @description 按钮操作
@@ -406,33 +461,109 @@ export default {
      */
     handleTableClick(row, value, idx) {
       if (value.event === "add") {
+        // stock_type === '0' 表示不限库存，直接添加不弹框
+        if (this.stock_type === '0') {
+          let data = {
+            session_id: this.session_id,
+            product_ids: [row.product_id], // 单个商品也包裹成数组
+          };
+          const loading = Loading.service({});
+          this.batchSessionAddProduct(data)
+            .then((res) => {
+              loading.close();
+              this.$message.success("添加成功");
+              this.getList();
+            })
+            .catch((err) => {
+              loading.close();
+              console.log(err, "err");
+            });
+        } else {
+          // 需要设置库存，显示弹框
+          this.stockTitle = "请配置商品限购库存";
+          this.stockForm = {
+            total_stock: '',
+          };
+          this.selectProductIds = [row.product_id]; // 单个商品也包裹成数组
+          this.showStockDialog = true;
+        }
+      }
+    },
+    handleBatchadd() {
+      // stock_type === '0' 表示不限库存，直接添加不弹框
+      if (this.stock_type === '0') {
         let data = {
           session_id: this.session_id,
-          product_id: row.product_id,
+          product_ids: this.selectList,
         };
-        this.sessionAddProduct(data)
+        const loading = Loading.service({});
+        this.batchSessionAddProduct(data)
           .then((res) => {
+            loading.close();
             this.$message.success("添加成功");
             this.getList();
           })
           .catch((err) => {
+            loading.close();
             console.log(err, "err");
           });
+      } else {
+        // 需要设置库存，显示弹框
+        this.stockTitle = "请配置商品限购库存";
+        this.stockForm = {
+          total_stock: '',
+        };
+        this.selectProductIds = this.selectList;
+        this.showStockDialog = true;
       }
     },
-    handleBatchadd() {
-      let data = {
-        session_id: this.session_id,
-        product_ids: this.selectList,
-      };
-      this.batchSessionAddProduct(data)
-        .then((res) => {
-          this.$message.success("添加成功");
-          this.getList();
-        })
-        .catch((err) => {
-          console.log(err, "err");
-        });
+    /**
+     * @description 取消设置库存
+     */
+    handleCancelStock() {
+      this.showStockDialog = false;
+    },
+    /**
+     * @description 确认设置库存并添加商品
+     */
+    handleConfirmStock() {
+      this.$refs.stockForm.validate((valid) => {
+        if (valid) {
+          const totalStock = Number(this.stockForm.total_stock);
+          const loading = Loading.service({});
+          this.batchSessionAddProduct({
+            session_id: this.session_id,
+            product_ids: this.selectProductIds,
+          }).then((res) => {
+            // 设置库存
+            if (totalStock > 0) {
+              this.updateStock({
+                session_id: this.session_id,
+                product_ids: this.selectProductIds,
+                total_stock: totalStock,
+              }).then(() => {
+                loading.close();
+                this.$message.success("添加并设置库存成功");
+                this.showStockDialog = false;
+                this.getList();
+              }).catch((err) => {
+                loading.close();
+                console.log(err, "库存设置失败");
+                this.showStockDialog = false;
+                this.getList();
+              });
+            } else {
+              loading.close();
+              this.$message.success("添加成功");
+              this.showStockDialog = false;
+              this.getList();
+            }
+          }).catch((err) => {
+            loading.close();
+            console.log(err, "err");
+          });
+        }
+      });
     },
     /**
      * @description 点击搜索进行搜索操作
@@ -568,7 +699,7 @@ export default {
             console.log("remoteSearch", query, resolve);
             // $vm.handleRemoteSearch(query, resolve)
             getOptions({
-              server: "supplier-partner",
+              server: 'supplier-partner',
               fn: "brand",
               path: "p1",
               params: {
@@ -639,7 +770,7 @@ export default {
     handleRemoteSearch({ query }, resolve) {
       console.log("handleRemoteSearch", query, resolve);
       getOptions({
-        server: "supplier-partner",
+        server: 'supplier-partner',
         fn: "supplier",
         path: "p1",
         params: {

package/package.json

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