Просмотр исходного кода

Merge branch 'master' of git.huaml.com:zhh/front-end

shizhongqi 10 месяцев назад
Родитель
Сommit
a43a720ea2

+ 1 - 1
ghsApp/src/admin/home/login.vue

@@ -26,7 +26,7 @@
 					<view style="color:black;font-size:30upx;margin-top:15upx;">才能使用相应功能,请谅解</view>
 					<view style="color:black;font-size:30upx;margin-top:15upx;margin-bottom:30upx;">如不需要,可以点击<text style="color:#3385FF;font-size:36upx;font-weight:bold;margin-left:8upx;" @click="goBack()">拒绝使用</text></view>
 				<button class="admin-button-com small buttonText" open-type="getPhoneNumber" @getphonenumber="wxPhoneLogin"
-				style="background-color:#2BA245;border-color:#2BA245;color:white;height:120upx;line-height:120upx;">手机号快捷登录</button>
+				style="background-color:#2BA245;border-color:#2BA245;color:white;height:120upx;line-height:120upx;">手机号一键登录</button>
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->

+ 1 - 1
hdApp/src/admin/home/apply.vue

@@ -62,8 +62,8 @@ export default {
             { name: "员工业绩", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ygyj2.png`, url: "/admin/staff/achieve",pf:1},
             { name: "功能开关", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/pagesPurchase/open",pf:1},
             { name: "失信人员", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/ll/list",pf:1},
-            { name: "充值规则", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/recharge/discount",pf:1},
             { name: "会员等级", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/member/level",pf:1},
+            { name: "充值规则", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/recharge/discount",pf:1},
             { name: "收款码", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/cg/code",pf:1}
           ]
         },

+ 1 - 1
hdApp/src/admin/home/login.vue

@@ -28,7 +28,7 @@
 					<view style="color:black;font-size:30upx;margin-top:15upx;margin-bottom:30upx;">如不需要,可以点击<text style="color:#3385FF;font-size:36upx;font-weight:bold;margin-left:8upx;" @click="goBack()">拒绝使用</text></view>
 
 				<button class="admin-button-com small buttonText" style="background-color:#2BA245;border-color:#2BA245;color:white;height:120upx;line-height:120upx;"
-				open-type="getPhoneNumber" @getphonenumber="wxPhoneLogin">手机号快捷登录</button>
+				open-type="getPhoneNumber" @getphonenumber="wxPhoneLogin">手机号一键登录</button>
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -70,7 +70,7 @@
         <text style="color:#3385ff;text-decoration: underline;margin-left:10upx;">去设置</text>
       </view>
       <view style="text-align: center;font-size:42upx;font-weight:bold;color:red;margin-bottom:30upx;margin-top:10upx;" @click="setRecharge" v-if="shopInfo.rechargeWeal == 0">
-        请设置充值活动的规则
+        请设置充值规则
         <text style="color:#3385ff;text-decoration: underline;margin-left:10upx;">去设置</text>
       </view>
       <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;">{{ data.warning }}</view>

+ 50 - 56
hdApp/src/admin/member/detail.vue

@@ -16,6 +16,17 @@
               <span class="user-id">ID {{ data.id }}</span>
             </div>
           </div>
+          <div class="member-level-badge" v-if="Number(data.member)>0">
+            <view class="member-badge-row">
+              <image v-if="data.member == 1" class="member-badge-icon" style="width:76upx;height:76upx;" src="@/static/member-icons/member-1.svg" mode="aspectFit"></image>
+              <image v-else-if="data.member == 2" class="member-badge-icon" style="width:74upx;height:74upx;" src="@/static/member-icons/member-2.svg" mode="aspectFit"></image>
+              <image v-else-if="data.member == 3" class="member-badge-icon" style="width:73upx;height:73upx;" src="@/static/member-icons/member-3.svg" mode="aspectFit"></image>
+              <image v-else-if="data.member == 4" class="member-badge-icon" style="width:82upx;height:82upx;" src="@/static/member-icons/member-4.svg" mode="aspectFit"></image>
+              <image v-else-if="data.member == 5" class="member-badge-icon" style="width:77upx;height:77upx;" src="@/static/member-icons/member-5.svg" mode="aspectFit"></image>
+              <text class="member-name">{{ data.memberName }}</text>
+            </view>
+
+          </div>
         </div>
       </div>
       <div class="user-bottom">
@@ -319,28 +330,6 @@
       </template>
     </modal-module>
     
-    <modal-module :show="upgradeModal" @click="upgradeModalClick" :maskClosable="false" title="升级" padding="30rpx 30rpx" >
-      <template v-slot:content>
-        <div class="app-modal-input-wrap">
-          <div class="inp-list-line">
-            <div class="line-label">会员等级</div>
-            <div class="line-input">
-              <picker mode="selector" :value="upgradeForm.member" :range="levelData.list" range-key="level" @change="changeLevelFn" class="inp-select" >
-                <div v-if="upgradeForm.member">{{ levelSelData.level }}</div>
-                <div class="tui-placeholder" v-else>请选择</div>
-              </picker>
-            </div>
-          </div>
-          <div class="inp-list-line">
-            <div class="line-label">确认密码</div>
-            <div class="line-input">
-              <input type="text" v-model="upgradeForm.confirmPassword" class="inp-input" />
-            </div>
-          </div>
-        </div>
-      </template>
-    </modal-module>
-
     <modal-module :show="remarkModal" @click="remarkModalClick" :maskClosable="false" title="添加客户备注" padding="30rpx 30rpx" >
       <template v-slot:content>
         <div class="app-modal-input-wrap">
@@ -433,10 +422,10 @@
 		</modal-module>
 
     <uni-popup ref="memeberChangeRef" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-		<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-			<view style="width:100vw;margin-top:8upx;" v-for="(item,index) in weal" :key="index"><button @click="modifyMember(item)">{{ item.name }}</button></view>
-			<view style="width:100vw;margin-top:50upx;"><button @click="cancelModifyMember()">取消</button></view>
-		</view>
+      <view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="width:100vw;margin-top:8upx;" v-for="(item,index) in memberLevelData" :key="index"><button @click="changeCustomLevel(item)">{{ item.name }}</button></view>
+        <view style="width:100vw;margin-top:50upx;"><button @click="cancelModifyMember()">取消</button></view>
+      </view>
 	  </uni-popup>
 
 		<!-- 减余额弹框 - 使用uni-popup替代 -->
@@ -506,7 +495,7 @@ import { getLevel } from "@/utils/config";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getUserDet, remarkAdd, remarkDel, upgrade, resetPassword } from "@/api/member";
 import { changeName,changeMemberLevel,modifyBirthday } from "@/api/custom"
-import { getWeal } from "@/api/member"
+import { getWeal,getLevelInitData } from "@/api/member"
 import {toManRecharge} from "@/api/recharge"
 import {deductBalance} from "@/api/deduct"
 export default {
@@ -529,7 +518,6 @@ export default {
       rechargeModal: false,
       userTagModal:false,
       passwordModal: false,
-      upgradeModal: false,
       remarkModal: false,
       birthdayModal: false,
       lunar: 0, // 0公历 1农历
@@ -598,8 +586,9 @@ export default {
         rechargePayWay:0,
       },
       rechargeInputFocus: false,
-      showBalanceDetail: false, // 控制余额详情展开/隐藏
-
+      showBalanceDetail: false,
+      memberLevelSet:0,
+      memberLevelData:[]
     };
   },
   computed: {
@@ -612,6 +601,12 @@ export default {
         this.rechargeWeal = res.data.rechargeWeal ? res.data.rechargeWeal : 0
       }
     })
+    getLevelInitData().then(res=>{
+      if(res.code == 1){
+        this.memberLevelSet = res.data.memberLevelSet
+        this.memberLevelData = res.data.member?res.data.member:[]
+      }
+    })
   },
   onShow(){
     this.initInfo()
@@ -678,14 +673,16 @@ export default {
       })
     },
     beginModifyMember(){
-		this.$msg('开发中')
-		return false
-		this.$refs.memeberChangeRef.open('top')
+		  this.$refs.memeberChangeRef.open('top')
     },
     cancelModifyMember(){
       this.$refs.memeberChangeRef.close()
     },
-    modifyMember(item){
+    changeCustomLevel(item){
+      if(this.memberLevelSet == 0){
+        this.$msg('请先设置会员等级')
+        return false
+      }
       changeMemberLevel({customId:this.option.id,level:item.level}).then(res=>{
         if(res.code == 1){
           this.$msg(res.msg)
@@ -822,13 +819,10 @@ export default {
       });
     },
     _remarkAdd() {
-      remarkAdd({
-        userId: this.data.id,
-        ...this.remarkForm
-      }).then(res => {
-        this.$msg("添加成功!");
-        this.getCustomInfo();
-      });
+      remarkAdd({ userId: this.data.id, ...this.remarkForm }).then(res => {
+        this.$msg("添加成功!")
+        this.getCustomInfo()
+      })
     },
     _delRemark() {
       remarkDel({ id: this.remarkOperateData.id }).then(res => {
@@ -857,14 +851,6 @@ export default {
         this.promptRemarkModal = true;
       }
     },
-    upgradeModalClick(e) {
-      if (e.index === 0) {
-
-      } else {
-        this.promptModalText = "确认升级?";
-        this.promptRemarkModal = true;
-      }
-    },
     userTagModalClick(e){
       if (e.index === 0) {
 
@@ -1010,15 +996,23 @@ export default {
       
       .member-level-badge {
         @include disFlex(center, flex-end);
-        flex-direction: column;
-        align-items: flex-end;
         margin-left: 20upx;
         
-        .member-name {
-          font-weight: 600;
-          font-size: 28upx;
-          color: #09C567;
-          text-align: right;
+        .member-badge-row {
+          @include disFlex(flex-end, center);
+          flex-direction: column;
+          gap: 8upx;
+          
+          .member-badge-icon {
+            flex-shrink: 0;
+          }
+          
+          .member-name {
+            font-weight: 600;
+            font-size: 26upx;
+            color: #09C567;
+            text-align: center;
+          }
         }
         
         .discount-tag {

+ 5 - 5
hdApp/src/admin/recharge/discount.vue

@@ -17,7 +17,7 @@
 								<text class="intro-tip-text">按照金额从小到大的顺序,配置五个档位</text>
 							</view>
 							<view class="intro-tip-item highlight">
-								<text class="intro-tip-text">客户有欠款未结,充值时将没有赠送</text>
+								<text class="intro-tip-text">客户有欠款未结,充值时将没有赠送</text>
 							</view>
 						</view>
 					</view>
@@ -421,11 +421,11 @@ export default {
 /* ==== 表格输入框样式 ==== */
 .table-input {
 	width: 100%;
-	height: 60upx;
+	height: 80upx;
 	border: 1upx solid #ddd;
 	border-radius: 6upx;
 	padding: 0 12upx;
-	font-size: 28upx;
+	font-size: 36upx;
 	font-weight: 500;
 	text-align: center;
 	color: #333;
@@ -498,8 +498,8 @@ export default {
 		}
 		
 		.table-input {
-			height: 50upx;
-			font-size: 24upx;
+			height: 70upx;
+			font-size: 32upx;
 		}
 	}
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 1
hdApp/src/static/member-icons/member-5.svg


+ 1 - 1
mallApp/src/pages/login/index.vue

@@ -10,7 +10,7 @@
 					  <view style="color:black;font-size:30upx;margin-top:15upx;margin-bottom:50upx;">如不需要,您可以点击<text style="color:#3385FF;font-size:36upx;font-weight:bold;margin-left:15upx;" @click="goBack()">拒绝使用</text></view>
 
             <button class="admin-button-com blue big" style="border:none;height:110upx;line-height:60upx;" open-type="getPhoneNumber" @getphonenumber="getWxMobile">
-            知道了,用手机号快捷登录
+            手机号一键登录
             </button>
 
           </view>

Некоторые файлы не были показаны из-за большого количества измененных файлов