shish 6 mesi fa
parent
commit
a0c82d4e36

+ 7 - 5
ghsApp/src/admin/custom/selectCustom.vue

@@ -29,11 +29,13 @@
                   余额<span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
                 </span>
 
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">没有下过单</text>
+                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1周未下单</text>
+                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1个月未下单</text>
+                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超半年未下单</text>
+                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1年未下单</text>
+
+                <text v-if="Number(item.risePercent)>0" style="color:#3385FF;font-weight:normal;margin-left:15upx;">{{ item.risePercent }}%</text>
 
               </div>
             </div>

+ 11 - 9
ghsApp/src/admin/home/member.vue

@@ -40,20 +40,22 @@
                 </span>
 
                 <block v-if="item.passStatus == 1">
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">没有下过单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1周未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1个月未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超半年未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">超1年未下单</text>
                 </block>
                 <block v-else>
-                  <text style="font-size:28upx;margin-left:20upx;color:#3385FF;font-weight:bold;">待审核</text>
+                  <text style="font-size:28upx;margin-left:15upx;color:#3385FF;font-weight:bold;">待审核</text>
                 </block>
 
-                <text v-if="Number(item.black)==2" style="color:red;font-weight:bold;margin-left:20upx;">黑名单</text>
-                <text v-if="Number(item.delStatus)==1" style="color:red;font-weight:bold;margin-left:20upx;">已删除</text>
+                <text v-if="Number(item.risePercent)>0" style="color:#3385FF;font-weight:normal;margin-left:15upx;">{{ item.risePercent }}%</text>
 
-                <text v-if="item.distName!=''" style="color:#e0c8c8;font-weight:normal;margin-left:20upx;">{{ item.distName }}</text>
+                <text v-if="Number(item.black)==2" style="color:red;font-weight:bold;margin-left:15upx;">黑名单</text>
+                <text v-if="Number(item.delStatus)==1" style="color:red;font-weight:bold;margin-left:15upx;">已删除</text>
+
+                <text v-if="item.distName!=''" style="color:#e0c8c8;font-weight:normal;margin-left:15upx;">{{ item.distName }}</text>
 
               </div>
             </div>

+ 4 - 0
ghsApp/src/api/custom/index.js

@@ -48,6 +48,10 @@ export const modifyShortName = data => {
 	return https.get('/custom/modify-short-name', data)
 }
 
+export const changeRiseRule = data => {
+	return https.get('/custom/change-rise-rule', data)
+}
+
 export const modifyHomeParams = data => {
 	return https.get('/custom/modify-home-amount', data)
 }

+ 37 - 12
ghsApp/src/pagesClient/member/detail.vue

@@ -13,17 +13,19 @@
                   <view>{{userInfo.originName}}</view>
                   <view style="font-size:26upx;">
                     ID {{userInfo.sn}}
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 10000" style="margin-left:18upx;color:green;font-weight:bold;">没有下过单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 7" style="margin-left:18upx;color:green;font-weight:bold;">超1周未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 30" style="margin-left:18upx;color:green;font-weight:bold;">超1个月未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 180" style="margin-left:18upx;color:green;font-weight:bold;">超半年未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 365" style="margin-left:18upx;color:green;font-weight:bold;">超1年未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 10000" style="margin-left:15upx;color:green;">没有下过单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 7" style="margin-left:15upx;color:green;">超1周未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 30" style="margin-left:15upx;color:green;">超1个月未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 180" style="margin-left:15upx;color:green;">超半年未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 365" style="margin-left:15upx;color:green;">超1年未下单</text>
 
-                    <text v-if="Number(userInfo.black)==2" style="color:red;font-weight:bold;margin-left:18upx;">黑名单</text>
-                    <text v-if="Number(userInfo.delStatus)==1" style="color:red;font-weight:bold;margin-left:18upx;">已删除</text>
+                    <text v-if="Number(userInfo.black)==2" style="color:red;font-weight:bold;margin-left:15upx;">黑名单</text>
+                    <text v-if="Number(userInfo.delStatus)==1" style="color:red;font-weight:bold;margin-left:15upx;">已删除</text>
 
-                    <text v-if="userInfo.distName!=''" style="margin-left:18upx;color:#ceb8b8;" @click="openDistSelect">{{ userInfo.distName }}</text>
-                    <text v-else style="margin-left:18upx;color:#ceb8b8;" @click="openDistSelect">请设片区</text>
+                    <text v-if="Number(userInfo.risePercent)>0" style="margin-left:15upx;color:#3385ff;">{{ userInfo.risePercent }}%</text>
+
+                    <text v-if="userInfo.distName!=''" style="margin-left:15upx;color:#ceb8b8;" @click="openDistSelect">{{ userInfo.distName }}</text>
+                    <text v-else style="margin-left:15upx;color:#ceb8b8;" @click="openDistSelect">请设片区</text>
                   </view>
                 </view>
             </view>
@@ -171,6 +173,18 @@
               <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)">大客价</button>
             </tui-list-cell>
 
+            <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
+              <div class="tui-title">涨价比例</div>
+              <input v-model="userInfo.risePercent" @click="userInfo.risePercent=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="9即涨9%,不涨填0" type="number" style="width:280upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
+            </tui-list-cell>
+
+            <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
+              <div class="tui-title">涨价幅度</div>
+              <input v-model="userInfo.riseRange" @click="userInfo.riseRange=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:280upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
+            </tui-list-cell>
+
             <view style="border:2upx solid #CCCCCC;">
               <tui-list-cell class="line-cell" :hover="false">
                 <div class="tui-title">送货上门</div>
@@ -183,11 +197,11 @@
 
               <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
                 <div class="tui-title">最低消费金额</div>
-                <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="digit" style="width:260upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
+                <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="digit" style="width:280upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
               </tui-list-cell>
               <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
                 <div class="tui-title">最低消费扎数</div>
-                <input v-model="userInfo.homeNum" @click="userInfo.homeNum=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:260upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
+                <input v-model="userInfo.homeNum" @click="userInfo.homeNum=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:280upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
                 <button class="admin-button-com blue middle" @tap="changeHomeParams">确定</button>
               </tui-list-cell>
             </view>
@@ -344,7 +358,7 @@ import ModalModule from "@/components/plugin/modal"
 import { getUserDet,debt} from "@/api/member";
 import { IMGHOST } from '@/config'
 import { mapGetters } from "vuex"
-import { changeShowStock,changePassStatus,toChangeHome,changeWlName,modifyShortName,modifyHomeParams,changeLevel,changeDebtLimitPay,createSeatSnFn,modifySeatSnFn,changeDelStatus } from "@/api/custom"
+import { changeShowStock,changePassStatus,toChangeHome,changeWlName,modifyShortName,modifyHomeParams,changeRiseRule,changeLevel,changeDebtLimitPay,createSeatSnFn,modifySeatSnFn,changeDelStatus } from "@/api/custom"
 import { updateDebtLimit,updateCustomBlack,changeDiscount,changeName,rechargeFn,getGatheringCode} from "@/api/custom";
 import { getAllDist,changeDist } from "@/api/dist"
 export default {
@@ -368,6 +382,8 @@ export default {
         home:1,
         homeAmount:0,
         homeNum:0,
+        risePercent:0,
+        riseRange:0,
         wlId:0,
         level:1,
         staffName:'',
@@ -563,6 +579,15 @@ export default {
         })
       })
     },
+    changeRise(){
+      let risePercent = this.userInfo.risePercent
+      let riseRange = this.userInfo.riseRange
+      changeRiseRule({id:this.option.id,risePercent:risePercent,riseRange:riseRange}).then(res=>{
+        if(res.code == 1){
+          this.$msg('修改成功')
+        }
+      })
+    },
     changeHomeParams(){
       if(this.$util.isEmpty(this.userInfo.homeAmount)){
         this.$msg('请填写最低消费金额')