jufubao-admin-library 1.1.134 → 1.1.136

package/library/viewModules/viewStore/viewStore/rule/list.vue

@@ -229,7 +229,7 @@ export default {
       })
         .then(() => {
           let params = {
-            task_type:'curule'
+            task_types:['curule']
           }
           this.selectShopRuleExecTask(params).then(res => {
             this.$message.success("操作成功")

package/library/viewModules/viewStore/viewStore/task/list.vue

@@ -65,6 +65,23 @@
         </div>
         <xd-json-view :data="data" :level="1" show></xd-json-view>
       </xd-dialog>
+      <xd-dialog
+        :show.sync="dialogUpdate"
+        v-if="dialogUpdate"
+        title="请选择更新任务类型"
+        width="600px"
+        @onClose="dialogUpdate=false"
+        @onCancel="dialogUpdate=false"
+        @onConfirm="handleConfirmUpdate"
+      >
+       <el-checkbox-group v-model="updateType">
+          <el-checkbox
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.value"
+          >{{ item.label }}  <span class="notice">{{item.notice}}</span></el-checkbox>
+        </el-checkbox-group>
+      </xd-dialog>
     </el-card>
   </div>
 </template>
@@ -78,6 +95,7 @@ import XdJsonView from "@/components/XdJsonView"
 import { Loading } from 'element-ui'
 import checkPermission from "@/utils/permission"
 import permissions from "@/constant/permissions"
+import { getOptions } from "@/utils/options"
 // import Role from "@/constant/modules/adminPolicyTask"
 import {
   mapActions,
@@ -142,6 +160,9 @@ export default {
       dialogShow: false,
       data: null,
       // policy_type: "SE",  //策略类型 SE=选品策略 MP=调价策略
+      updateType:[],
+      typeList:[],
+      dialogUpdate:false,
     }
   },
   created () {
@@ -283,10 +304,27 @@ export default {
     },
     //执行
     handleExecute(){
+      getOptions({
+        server: "supplier-partner",
+        fn: "select-shop-task",
+        path: "p3",
+        params:{
+          
+        }
+      }).then((res) => {
+        this.typeList = res.data.task_types
+        this.updateType = this.typeList.map(item => item.value);
+        this.dialogUpdate = true;
+      })
+      
+    },
+    handleConfirmUpdate(){
       let params = {
+        task_types:this.updateType
       }
       this.selectShopRuleExecTask(params).then(res => {
         this.$message.success("操作成功")
+        this.dialogUpdate = false;
         this.getList()
       })
     },
@@ -303,5 +341,15 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+::v-deep .el-checkbox{
+  margin: 5px 0!important;
+  display: block!important;
+}
+.notice{
+  font-size: 14px;
+  display: inline-block;
+  margin-left: 20px;
+  color: #8D8686;
+}
 </style>
 

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

@@ -228,7 +228,8 @@ module.exports = {
       isRule: false,
       data: {
         id:['点位ID', 'string', '必填'],
-        map_point_color:['map_point_color', 'string', '必填'],
+        map_point_color:['地图点位颜色（已到达点位）', 'string', '必填'],
+        map_point_color_for_no_arrived:['地图点位颜色（未到达点位）', 'string', '必填'],
       },
       disabled: true,
       role: '',

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

@@ -30,8 +30,12 @@
           ></el-slider>
         </div>
         <div class="btn-item">
-          <span>点位颜色:</span>
-          <el-color-picker v-model="color" size="small" @change="handleColorChange"></el-color-picker>
+          <span>未到达点位颜色:</span>
+          <el-color-picker v-model="noArriveColor" size="small" @change="e => handleColorChange(e)"></el-color-picker>
+        </div>
+        <div class="btn-item">
+          <span>到达点位颜色:</span>
+          <el-color-picker v-model="color" size="small" @change="e => handleColorChange(e)"></el-color-picker>
         </div>
       </div>
       <div class="right">
@@ -120,6 +124,7 @@ export default {
 
       //页面可编辑数据
       color:'rgb(52, 152, 219)',
+      noArriveColor:'#999999',
       name:'',
       status:'Y',
       backgroundImage:'',
@@ -247,6 +252,7 @@ export default {
         this.getImageInfo(backgroundImage,()=>{
           this.radius = info['map_point_size'] || 43;
           this.color = info['map_point_color'] || '#3498db';
+          this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
           this.name = info['map_name'];
           this.backgroundImage = backgroundImage;
           loading.close()
@@ -482,7 +488,12 @@ export default {
     handleColorChange(e){
       console.log(e,'eee')
       if(e){
-        this.walkingPointColor({id:this.map_id,map_point_color:e})
+        let data = {
+          id: this.map_id,
+          map_point_color_for_no_arrived: this.noArriveColor,
+          map_point_color: this.color
+        };
+        this.walkingPointColor(data)
         .then(res=>{
           this.$message.success('修改点位颜色成功')
         })

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listChannel.vue

@@ -98,7 +98,8 @@ export default {
       showNoticeSetting: false,
       remind_threshold_amount: "",
       wallet_type: '',
-      owner_id: ''
+      owner_id: '',
+      optionsData:null,
     }
   },
   computed: {
@@ -108,6 +109,7 @@ export default {
         { "type": "normal", "prop": "supplier_name", "align": "center", "minWidth": 200, "label": "接口名称" },
         checkPermission([roleWallet.getChannelAmount]) && { "type": "normal", "prop": "api_amount", "align": "center",  "label": "接口余额" },
         { "type": "price", "prop": "amount", "align": "center", "width": 100, "label": "平台余额", "unit": "元"},
+        { "type": "normal", "prop": "wallet_type_name", "align": "center", "minWidth": 200, "label": "钱包类型" },
         { "type": "normal", "prop": "updated_time", "align": "center", "minWidth": 200, "label": "更新时间" },
         checkPermission([roleTRecord.listSupplier]) && {
           "type": "operate", "align": "center", "label": "操作",
@@ -120,7 +122,21 @@ export default {
     }
   },
   created() {
-    this.initSearchForm();
+    getOptions({
+      server: 'finance-partner',
+      fn: 'wallet',
+      path: 'p1',
+      params:{
+        type:'channel'
+      }
+    }).then(res=>{
+      console.log(res,'ss')
+      this.optionsData = res.data
+      this.initSearchForm();
+    }).catch(err=>{
+      console.log(err,'eee')
+    })
+    
   },
   methods: {
     ...mapActions("wallet", ["listChannelWallet", "getChannelAmount",'channelAmountNotice']),
@@ -241,6 +257,15 @@ export default {
           value: "",
           placeholder: "请输入渠道ID"
         },
+        {
+          label: '钱包类型:',
+          ele: 'xd-select-list',
+          valueKey: 'wallet_type',
+          value: "",
+          placeholder: '请选择钱包类型',
+          className:'input40',
+          list: this.optionsData.list_wallet_type,
+        },
       ];
     },
     /**

package/library/viewModules/viewsThird/schemas/service.js

@@ -246,5 +246,17 @@ module.exports = {
     role: '@@@@.@@@.SERVICE_FREE_RULE_PUBLIST',
     // #endif
 
+  },{
+    title: '发布平台 - 按页面路由与业务线获取第一个应用的一个页面目录信息',
+    mapFn: "pageCatelogByPageRoute",
+    path: "/editx/v1/platforms/page-catelog-by-page-route",
+    isRule: false,
+    isPublic:true,
+    params: {
+      site_id: ['site_id', 'String', '是'],
+      business_code: ['business_code', 'String', '否'],
+      page_route: ['page_route', 'String', '否'],
+    },
+    disabled: true,
   }],
 }

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

@@ -541,6 +541,7 @@ export default {
       "getServiceFeeRuleList",
       "delServiceFeeRule",
       "publishService",
+      "pageCatelogByPageRoute",
     ]),
     insertArrayAt(arr1, index, arr2) {
       return arr1.slice(0, index).concat(arr2, arr1.slice(index));
@@ -758,19 +759,9 @@ export default {
             if (res.data.pay_error_url_data) {
               res.data.pay_error_url_data = JSON.parse(res.data.pay_error_url_data);
             }
-            let keys = Object.keys(res.data);
-            this.openDialogForm.map(item=>{
-              if(keys.includes(item.valueKey)) {
-                if(item.ele==='xd-select-site-path') {
-                  if(res.data[item.valueKey]) {
-                    res.data[item.valueKey]= JSON.parse(
-                      res.data[item.valueKey]
-                    );
-                  }
-                  
-                }
-              }
-            })
+            if (res.data.phone_collect_url_data) {
+              res.data.phone_collect_url_data = JSON.parse(res.data.phone_collect_url_data);
+            }
             this.initForm(res.data);
           })
           .catch((err) => {});
@@ -1072,14 +1063,16 @@ export default {
             //     },
             //   ],
             // },
-            {
+           params.site_id&&{
               label: "订单结算页:",
               ele: "xd-select-site-path",
               className: "input100",
               valueKey: "pay_url_data",
+              placeholder:'请选择业务线对应应用的三方支付页面',
               value: params.pay_url_data || null,
               setting: {
-                site_id: this.site_id,
+                site_id: params.site_id,
+                hiddenSite:true,
               },
               handleCustom: ({ action, data }) => {
                 if (action === "siteList") {
@@ -1150,14 +1143,16 @@ export default {
                 },
               ],
             },
-            this.$channelCode==='gxzx'&&{
-              label: "订单错误页:",
+            this.$channelCode==='wenyu_dingdong'&&params.site_id&&{
+              label: "手机号收集页:",
               ele: "xd-select-site-path",
               className: "input100",
-              valueKey: "pay_error_url_data",
-              value: params.pay_error_url_data || null,
+              valueKey: "phone_collect_url_data",
+              placeholder:'请选择基础应用的手机号收集页面',
+              value: params.phone_collect_url_data || null,
               setting: {
-                site_id: this.site_id,
+                site_id: params.site_id,
+                hiddenSite:true,
               },
               handleCustom: ({ action, data }) => {
                 if (action === "siteList") {
@@ -1228,50 +1223,16 @@ export default {
                 },
               ],
             },
-            {
-              label: "状态:",
-              ele: "xd-radio",
-              valueKey: "status",
-              value: params.status || "Y",
-              placeholder: "请选择状态",
-              list: [
-                { value: "Y", label: "启用" },
-                { value: "N", label: "禁用" },
-              ],
-              rules: [
-                {
-                  required: true,
-                  message: "请选择状态",
-                  trigger: ["blur", "change"],
-                },
-              ],
-            },
-            // {
-            //   label: '品牌:', //label
-            //   ele: 'xd-check', //package 名称
-            //   valueKey: 'brand_id', //form[valueKey]
-            //   value: params.brand_id||[], //v-model
-            //   list: [
-            //     {"label": "万利达集团", "value": 4},
-            //     {"label": "中国联通", "value": 5},
-            //     {"label": "中国移动", "value": 6},
-            //     {"label": "味多美", "value": 7},
-            //   ],
-            // rules: [
-            //   {required: true, message: '请选择品牌', trigger: ['blur', 'change']},
-            // ]
-            // },
-          ].filter((i) => i);
-               this.openDialogForm = this.openDialogForm.map(item=>{
-            if(item.ele === "xd-select-site-path"){
-              item = {
-              label: item.label,
+            this.$channelCode==='gxzx'&&params.site_id&&{
+              label: "订单错误页:",
               ele: "xd-select-site-path",
               className: "input100",
-              valueKey: item.valueKey,
-              value: params[item.valueKey] || null,
+              valueKey: "pay_error_url_data",
+              placeholder:'请选择基础应用的授权失败页面',
+              value: params.pay_error_url_data || null,
               setting: {
-                site_id: this.site_id,
+                site_id: params.site_id,
+                hiddenSite:true,
               },
               handleCustom: ({ action, data }) => {
                 if (action === "siteList") {
@@ -1341,8 +1302,42 @@ export default {
                   trigger: "change",
                 },
               ],
-            }
-            }
+            },
+            {
+              label: "状态:",
+              ele: "xd-radio",
+              valueKey: "status",
+              value: params.status || "Y",
+              placeholder: "请选择状态",
+              list: [
+                { value: "Y", label: "启用" },
+                { value: "N", label: "禁用" },
+              ],
+              rules: [
+                {
+                  required: true,
+                  message: "请选择状态",
+                  trigger: ["blur", "change"],
+                },
+              ],
+            },
+            // {
+            //   label: '品牌:', //label
+            //   ele: 'xd-check', //package 名称
+            //   valueKey: 'brand_id', //form[valueKey]
+            //   value: params.brand_id||[], //v-model
+            //   list: [
+            //     {"label": "万利达集团", "value": 4},
+            //     {"label": "中国联通", "value": 5},
+            //     {"label": "中国移动", "value": 6},
+            //     {"label": "味多美", "value": 7},
+            //   ],
+            // rules: [
+            //   {required: true, message: '请选择品牌', trigger: ['blur', 'change']},
+            // ]
+            // },
+          ].filter((i) => i);
+          this.openDialogForm = this.openDialogForm.map(item=>{
             return item;
           })
           listForm = this.insertArrayAt(listForm, 3, this.openDialogForm);
@@ -1508,16 +1503,11 @@ export default {
           this.listValue.pay_error_url_data
         );
       }
-      let keys = Object.keys(this.listValue);
-      this.openDialogForm.map(item=>{
-        if(keys.includes(item.valueKey)) {
-          if(item.ele==='xd-select-site-path') {
-            copyListValue[item.valueKey]= JSON.stringify(
-              this.listValue[item.valueKey]
-            );
-          }
-        }
-      })
+      if (this.listValue.phone_collect_url_data) {
+        copyListValue.phone_collect_url_data = JSON.stringify(
+          this.listValue.phone_collect_url_data
+        );
+      }
       return copyListValue;
     },
     handleConfirmSave() {

package/package.json

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