问题修复，增加点单智能推荐页面

http/api/market/suggest.js

@@ -0,0 +1,41 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "market";
+
+export function suggestPage(params) {
+  return request({
+    url: urlType + `/admin/suggest/page`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+export function addSuggest(params) {
+  return request({
+    url: urlType + `/admin/suggest`,
+    method: "POST",
+    params: {
+      ...params,
+    },
+  });
+}
+export function editSuggest(params) {
+  return request({
+    url: urlType + `/admin/suggest`,
+    method: "PUT",
+    params: {
+      ...params,
+    },
+  });
+}
+export function deleteSuggest(params) {
+  return request({
+    url: urlType + `/admin/suggest`,
+    method: "DELETE",
+    params: {
+      ...params,
+    },
+  });
+}
+

pageMarket/distribution/components/fenxiao-user-list.vue

@@ -3,9 +3,9 @@
     <view class="u-m-t-32 item" v-for="item in list" :key="item.id">
       <view class="u-flex u-row-between">
         <view class="color-333 u-font-28">
-          <view> 用户昵称 </view>
+          <view> {{ item.shopUserName }} </view>
           <view class="u-m-t-4">
-            <text class="color-333 font-bold"> {{ item.shopUserName }}</text>
+            <text class="color-333 "> {{ item.shopUserPhone }}</text>
           </view>
         </view>
         <view>
@@ -82,7 +82,7 @@
           >是否确认重置分销组 重置后将会按照用户的实际数据匹配分销组</view
         >
       </view>
-      <view class="u-p-48 u-flex" v-if="modalData.key == 'cancel-group'">
+      <view class="u-p-48 u-flex" v-if="modalData.key == 'cancel-fenxiao'">
         <up-icon name="info-circle" color="#FF2F2F" size="20"></up-icon>
         <view class="u-font-32 color-333 u-m-l-20">是否确认取消分销员</view>
       </view>
@@ -179,6 +179,8 @@ async function handleConfirm() {
       id: modalData.data.id,
       shopId: uni.getSystemInfoSync("shopInfo").id || "",
     });
+    emits("refresh");
+
   }
   if (modalData.key == "change-group") {
     const level=distributionStore.config.levelConfigList.find((item) => item.id == group.value)
@@ -204,6 +206,10 @@ async function handleConfirm() {
     });
     emits("refresh");
   }
+  uni.showToast({
+    title:'操作成功',
+    icon:'none'
+  })
   group.value = "";
   modalData.show = false;
 }

pageMarket/distribution/components/open-list.vue

@@ -12,9 +12,9 @@
       </view>
       <view class="u-flex u-row-between u-m-t-16">
         <view class="color-333 u-font-28 color-666">
-          <view> 用户昵称 </view>
+          <view> {{item.nickName}} </view>
           <view class="u-m-t-4">
-            <text class=""> {{ item.nickName }}</text>
+            <text class=""> {{ item.phone }}</text>
           </view>
         </view>
         <text class="color-main u-font-32 font-700">{{ item.changeAmount }}</text>

pageMarket/distribution/index.vue

@@ -11,7 +11,7 @@
             <view class="u-font-28 u-flex-1 u-p-r-4">
               <view class="color-333 font-bold">分销</view>
               <view class="color-666 u-m-t-4 u-font-24"
-                >允许客户充值并使用余额支付
+                >用户成为业务员，可促进消费
               </view>
             </view>
             <up-switch
@@ -38,6 +38,7 @@
               v-model="keyWord"
               @blur="keyWordBlur"
             />
+            <up-icon v-if="keyWord" name="close" size="14" @click="clearKeyWord"></up-icon>
           </view>
           <view
             class="u-flex-1 u-font-28 filter-box u-flex u-row-between"
@@ -50,6 +51,9 @@
                 {{ userComponentQuery.startTime }} -
                 {{ userComponentQuery.endTime }}
               </text>
+              <view @click.stop="clearTime">
+                <up-icon name="close" size="14"></up-icon>
+              </view>
             </template>
             <template v-else>
               <text class="color-999">请选择日期范围</text>
@@ -66,14 +70,13 @@
             class="u-font-28 filter-box u-flex u-row-between"
             @click="showActions = true"
           >
-            <template v-if="selActions&&selActions.value">
+            <template v-if="selActions && selActions.value">
               <text class="u-font-28 u-m-r-10">{{ selActions.name }} </text>
             </template>
             <template v-else>
               <text class="color-999 u-m-r-10">全部</text>
             </template>
             <up-icon name="arrow-down" size="12"></up-icon>
-
           </view>
           <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
             <up-icon name="search" size="18"></up-icon>
@@ -97,6 +100,9 @@
                 {{ userComponentQuery.startTime }} -
                 {{ userComponentQuery.endTime }}
               </text>
+              <view @click.stop="clearTime">
+                <up-icon name="close" size="14"></up-icon>
+              </view>
             </template>
             <template v-else>
               <text class="color-999">请选择日期</text>
@@ -115,7 +121,7 @@
             <view class="u-font-32 color-main font-bold">{{
               listRes.totalAmount
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">支付开通人数</view>
+            <view class="u-font-24 color-666 u-m-t-16">已支付金额（元）</view>
           </view>
         </view>
         <view v-if="active == 3" class="u-flex u-m-t-32">
@@ -137,7 +143,9 @@
             }}</view>
             <view class="u-font-24 color-666 u-m-t-16">
               <text>运营余额（元）</text>
-              <text class="color-main" @click="go.to('PAGES_PAY')">充值{{'>'}}</text>
+              <text class="color-main" @click="go.to('PAGES_PAY')"
+                >充值{{ ">" }}</text
+              >
             </view>
           </view>
         </view>
@@ -229,7 +237,15 @@ const actions = [
     value: "refund",
   },
 ];
-const selActions=ref('')
+function clearKeyWord() {
+  keyWord.value = "";
+  userComponentQuery.user = "";
+}
+function clearTime() {
+  userComponentQuery.startTime = "";
+  userComponentQuery.endTime = "";
+}
+const selActions = ref("");
 const showActions = ref(false);
 function handleSelect(e) {
   selActions.value = e;
@@ -360,7 +376,7 @@ async function getList() {
       page: pageNum.value,
       size: 10,
       key: userComponentQuery.user,
-      status: selActions.value.value,
+      status: selActions.value?.value || "",
       startTime: userComponentQuery.startTime
         ? userComponentQuery.startTime + " 00:00:00"
         : "",
@@ -391,6 +407,9 @@ const active = ref(0);
 watch(
   () => active.value,
   (newval) => {
+    userComponentQuery.startTime = "";
+    userComponentQuery.endTime = "";
+    keyWord.value = "";
     console.log(newval);
     pageNum.value = 1;
     getList();
@@ -399,21 +418,28 @@ watch(
 watch(
   () => active.value,
   (newval) => {
+
+    refresh();
+  }
+);
+watch(
+  () => selActions.value,
+  () => {
     refresh();
   }
 );
-watch(()=>selActions.value,()=>{
-  refresh()
-})
 onReachBottom(() => {
   if (!isEnd.value) {
     pageNum.value++;
     getList();
   }
 });
-watch(()=>distributionStore.config.isEnable,()=>{
+watch(
-    distributionStore.editConfig()
+  () => distributionStore.config.isEnable,
-})
+  () => {
+    distributionStore.editConfig();
+  }
+);
 onShow(() => {
   pageNum.value = 1;
   getList();

pageMarket/distribution/level-list.vue

@@ -33,7 +33,7 @@
       <view class="u-m-t-60">
         <view class="title">名称</view>
         <view class="u-p-t-16 u-p-b-24">
-            <input placeholder="请输入名称" placeholder-class="color-999 u-font-28" v-model="item.name"></input>
+            <input placeholder="请输入名称" placeholder-class="color-999 u-font-28" v-model="item.name" @input="checkName($event, index)"></input>
         </view>
         <up-line></up-line>
         <view class="title u-m-t-24">分成比例</view>
@@ -50,7 +50,9 @@
             <view class="unit">%</view>
           </view>
         </view>
+        <template v-if="form.upgradeType!='not_upgrade'">
           <up-line></up-line>
+        <template v-if="form.upgradeType!='cost'">
           <view class="title u-m-t-24">有效人数</view>
         <view class="u-m-t-16 u-p-b-8">
             <view class="u-flex u-m-t-16">
@@ -64,13 +66,36 @@
             <view class="unit">人</view>
           </view>
         </view>
+
         <view class="color-999 u-font-24">有效人数：被邀请人在店铺消费过，即有一笔订单完成</view>
+
+        </template>
+        <template v-else>
+          <view class="title u-m-t-24">消费金额达</view>
+        <view class="u-m-t-16 u-p-b-8">
+            <view class="u-flex u-m-t-16">
+            <input
+              class="number-box"
+              placeholder="请输入"
+              placeholder-class="color-999 u-font-28"
+              type="digit"
+              v-model="item.costAmount"
+            />
+            <view class="unit">元</view>
+          </view>
+        </view>
+        <view class="color-999 u-font-24">消费金额：分销员和被邀请人在店铺订单消费总金额（不包含退款）</view>
+
+        </template>
+        </template>
+
+   
         <view class="u-m-t-24 u-flex u-row-right" style="gap: 40rpx;">
             <view class="u-flex" v-if="index==0||index==form.levelConfigList.length-1" @click="addLevelConfig">
                 <up-icon name="plus-circle-fill" color="#318AFE" ></up-icon>
                 <text class="u-m-l-16">{{index==0? '添加':'继续添加'}}</text>
             </view>
-            <view class="u-flex" @click="remove(index)">
+            <view class="u-flex" @click="remove(index)" v-if="index!=0">
                 <up-icon name="minus-circle-fill" color="#EB4F4F" ></up-icon>
                 <text class="u-m-l-16">删除</text>
             </view>
@@ -124,15 +149,19 @@ let timer=null
 //全部的分成比例加起来不能超过100%
 function checkNumberCommission(e,index){
     const value=e.detail.value
+    clearInterval(timer)
+    
     if(value>100){
         uni.showToast({
             title:'分成比例不能超过100',
             icon:'none'
         })
+        timer= setTimeout(()=>{
                  form.levelConfigList[index].levelOneCommission=''
+            },30) 
+       
         return false
     }
-    clearInterval(timer)
     //输入最多两位小数，两位小数点后的去除掉不让输入
     if(value.indexOf('.')!=-1){
         const arr=value.split('.')
@@ -144,6 +173,21 @@ function checkNumberCommission(e,index){
     }
  
 }
+
+function checkName(e,index){
+    const value=e.detail.value
+    if(value.length>10){
+        uni.showToast({
+            title:'名称最多10个字符',
+            icon:'none'
+        })
+        timer= setTimeout(()=>{
+          form.levelConfigList[index].name=value.substring(0,10)
+
+            },30)
+        return false
+    }
+}
 function remove(index){
     form.levelConfigList.splice(index,1)
     showDetailListSwitch.value.splice(index,1)
@@ -152,7 +196,8 @@ function addLevelConfig(){
     form.levelConfigList.push({
         name:'',
         levelOneCommission:'',
-        inviteCount:''
+        inviteCount:'',
+        costAmount:''
     })
     showDetailListSwitch.value.push(true)
 }
@@ -175,13 +220,28 @@ function addLevelConfig(){
             })
             return false
         }
-        if(item.inviteCount===''){
+        if(form.upgradeType==='not_upgrade'){
+            continue
+        }
+        if(form.upgradeType==='cost'){
+            if(item.costAmount===''||item.costAmount===null){
+                uni.showToast({
+                    title:'请输入消费金额',
+                    icon:'none'
+                })
+                return false
+            }
+        }else{
+            if(item.inviteCount===''||item.inviteCount===null){
                 uni.showToast({
                     title:'请输入有效人数',
                     icon:'none'
                 })
                 return false
             }
+
+        }
+        
     }
     return true
   }

pageMarket/distribution/money-recoders.vue

@@ -70,7 +70,7 @@
         </view>
         <view class="u-flex u-flex-between u-font-28 color-666 u-m-t-16">
           <view>
-            <text>关联订单：WX1987787224197300224</text>
+            <text>关联订单：{{item.orderNo}}</text>
             <text></text>
           </view>
           <view>

pageMarket/newUserDiscount/index.vue

@@ -54,7 +54,7 @@
                 placeholder="请输入内容"
                 placeholder-class="color-999 u-font-28"
                 type="number"
-                v-model="form.payAmount"
+                v-model="form.discountAmount"
               />
               <view class="unit">元</view>
             </view>
@@ -225,6 +225,7 @@ const form = reactive({
   discountType: "FIXED",
   useTypeList: [],
   randomDiscountList: [],
+  discountAmount: "",
 });
 
 function cancel() {
@@ -243,6 +244,13 @@ function save() {
     });
     return;
   }
+  if(form.discountType == "FIXED" && form.discountAmount == ""){
+    uni.showToast({
+      title:'请填写减免金额',
+      icon:'none'
+    })
+    return;
+  }
   newUserDiscountStore
     .editConfig(
       {
@@ -266,7 +274,14 @@ function save() {
 watch(
   () => newUserDiscountStore.config.isEnable,
   (newVal) => {
-    save();
+    newUserDiscountStore.editConfig().then((res) => {
+      if (res) {
+        uni.showToast({
+          title: "操作成功",
+          icon: "none",
+        });
+      }
+    });
   }
 );
 

pageMarket/orderRecommendation/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <view class="min-page bg-f7"></view>
+</template>

pages.json

@@ -698,6 +698,13 @@
 					"style": {
 						"navigationBarTitleText": "新客立减"
 					}
+				},
+				{
+					"pageId": "PAGES_MARKET_ORDER_RECOMMENDATION",
+					"path": "orderRecommendation/index",
+					"style": {
+						"navigationBarTitleText": "点餐智能推荐"
+					}
 				}
 			]
 		},

pages/appliccation/marketing.vue

@@ -100,7 +100,7 @@ const menuList = ref([
 			{
 				title: '点餐智能推荐',
 				icon: '',
-				pageUrl: '',
+				pageUrl: 'PAGES_MARKET_ORDER_RECOMMENDATION',
 				intro: '进入点单页X秒未点自动推荐商品，此推荐设置启用即生效'
 			},
 			{

store/market.js

@@ -69,9 +69,12 @@ export const useNewUserDiscountStore = defineStore("newUserDiscount", {
       this.config = data;
       return this.config;
     },
-    async editConfig(data,isAutoResrefresh = true) {
+    async editConfig(data, isAutoResrefresh = true) {
-      const res = await consumeDiscountApi.editConfig({ ...this.config, ...data });
+      const res = await consumeDiscountApi.editConfig({
-      if(isAutoResrefresh){
+        ...this.config,
+        ...data,
+      });
+      if (isAutoResrefresh) {
         this.getConfig();
       }
       return res;