Explorar o código

暂时先去掉充值福利

shish hai 6 meses
pai
achega
971a16cde0
Modificáronse 2 ficheiros con 1 adicións e 79 borrados
  1. 1 32
      hdApp/src/admin/member/detail.vue
  2. 0 47
      mallApp/src/pages/member/recharge.vue

+ 1 - 32
hdApp/src/admin/member/detail.vue

@@ -279,29 +279,6 @@
             </view>
             </view>
           </view>
           </view>
 
 
-                                <!-- 充值送金额 -->
-            <view v-if="rechargeWeal == 1" class="recharge-options">
-
-              <view class="options-title">充值活动:</view>
-              <view v-for="(item,index) in weal" :key="index" class="option-item">
-                <button 
-                  @click="getRecharge(item.recharge)"
-                  class="recharge-option-btn"
-                  :class="[rForm.rechargeAmount == item.recharge ? 'selected' : '']"
-                >
-                <view class="option-content">
-                  <view class="option-left">
-                    <text class="recharge-amount">充值{{ item.recharge }}元</text>
-                    <text class="give-info">送{{ item.give }}元</text>
-                  </view>
-                  <view class="option-right">
-                    {{ rForm.rechargeAmount == item.recharge ? '✓' : '选择' }}
-                  </view>
-                </view>
-              </button>
-            </view>
-
-          </view>
         </scroll-view>
         </scroll-view>
         
         
                  <!-- 弹框底部按钮 -->
                  <!-- 弹框底部按钮 -->
@@ -495,7 +472,7 @@ import { getLevel } from "@/utils/config";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getUserDet, remarkAdd, remarkDel, upgrade, resetPassword } from "@/api/member";
 import { getUserDet, remarkAdd, remarkDel, upgrade, resetPassword } from "@/api/member";
 import { changeName,changeMemberLevel,modifyBirthday } from "@/api/custom"
 import { changeName,changeMemberLevel,modifyBirthday } from "@/api/custom"
-import { getWeal,getLevelInitData } from "@/api/member"
+import { getLevelInitData } from "@/api/member"
 import {toManRecharge} from "@/api/recharge"
 import {toManRecharge} from "@/api/recharge"
 import {deductBalance} from "@/api/deduct"
 import {deductBalance} from "@/api/deduct"
 export default {
 export default {
@@ -578,8 +555,6 @@ export default {
       deductInputFocus: false,
       deductInputFocus: false,
       changeShow:false,
       changeShow:false,
       changeFocus:false,
       changeFocus:false,
-      weal:[],
-      rechargeWeal:0,
       rForm: {
       rForm: {
         rechargeAmount:'',
         rechargeAmount:'',
         rechargeRemark:'',
         rechargeRemark:'',
@@ -595,12 +570,6 @@ export default {
     ...mapGetters({ levelData: "getLevel" })
     ...mapGetters({ levelData: "getLevel" })
   },
   },
   onLoad(){
   onLoad(){
-    getWeal().then(res=>{
-      if(res.code == 1){
-        this.weal = res.data.weal ? res.data.weal:[]
-        this.rechargeWeal = res.data.rechargeWeal ? res.data.rechargeWeal : 0
-      }
-    })
     getLevelInitData().then(res=>{
     getLevelInitData().then(res=>{
       if(res.code == 1){
       if(res.code == 1){
         this.memberLevelSet = res.data.memberLevelSet
         this.memberLevelSet = res.data.memberLevelSet

+ 0 - 47
mallApp/src/pages/member/recharge.vue

@@ -53,16 +53,6 @@
 				<pay-input-module :focus="inpFocus" :num="amount" :hint="hint" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
 				<pay-input-module :focus="inpFocus" :num="amount" :hint="hint" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
 			</view>
 			</view>
 
 
-			<!-- 充值福利提示 -->
-			<view class="welfare-outer-container" v-if="hdInfo.balance >= 0 && Number(rechargeWeal)>0">
-				<view class="pointing-hand">👉</view>
-				<view class="welfare-tip-wrap" @click="showWelfareModal">
-					<view class="tip-icon">🎁</view>
-					<view class="tip-text">充值福利</view>
-					<view class="tip-arrow"></view>
-				</view>
-			</view>
-
 			<view class="btn-wrap">
 			<view class="btn-wrap">
 				<!-- #ifdef MP-WEIXIN -->
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="button-com green" @click="handleConfirmRecharge">微信支付</button>
 				<button class="button-com green" @click="handleConfirmRecharge">微信支付</button>
@@ -70,27 +60,6 @@
 			</view>
 			</view>
 		</view>
 		</view>
 
 
-		<!-- 福利选择弹框 -->
-		<ModalModule :show="welfareModalShow" title="充值福利" :custom="true" :button="[]" width="95%" @click="handleWelfareModal" >
-			<view class="welfare-modal-content">
-				<view class="welfare-title">充值福利</view>
-
-				<view class="welfare-list">
-					<view v-for="(item, index) in weal" :key="index" class="welfare-item" @click="selectWelfare(item)" >
-						<view class="welfare-info">
-							<view class="welfare-amount">充值{{item.recharge}}元</view>
-							<view class="welfare-gift">送{{item.give}}元</view>
-						</view>
-						<view class="welfare-tag">立即充值</view>
-					</view>
-				</view>
-
-				<view class="welfare-btn-wrap">
-					<button class="welfare-cancel-btn" @click="closeWelfareModal">取消</button>
-				</view>
-			</view>
-		</ModalModule>
-
 		<wangCg :loginStyle.sync="globalLoginStyle" @loginSuccess="loginSuccess()"></wangCg>
 		<wangCg :loginStyle.sync="globalLoginStyle" @loginSuccess="loginSuccess()"></wangCg>
 
 
 	</view>
 	</view>
@@ -105,7 +74,6 @@ import { share } from '@/mixins'
 import { rechargeFn } from '@/api/recharge'
 import { rechargeFn } from '@/api/recharge'
 import { postWxCode } from '@/api/mini'
 import { postWxCode } from '@/api/mini'
 import { getHdInfo } from '@/api/hd'
 import { getHdInfo } from '@/api/hd'
-import { getMemberWeal } from '@/api/member'
 import wangCg from "@/components/wangCg";
 import wangCg from "@/components/wangCg";
 export default {
 export default {
 	name: 'pay',
 	name: 'pay',
@@ -129,8 +97,6 @@ export default {
 			hdInfo:{balance:0},
 			hdInfo:{balance:0},
 			customInfo:{balance:0},
 			customInfo:{balance:0},
 			loginComeBack:0,
 			loginComeBack:0,
-			rechargeWeal:0,
-			weal:[],
 			hint:'请输入充值金额',
 			hint:'请输入充值金额',
 			// 福利选择弹框相关
 			// 福利选择弹框相关
 			welfareModalShow: false,
 			welfareModalShow: false,
@@ -217,15 +183,6 @@ export default {
 						uni.setStorageSync('hdId', that.hdInfo.id)
 						uni.setStorageSync('hdId', that.hdInfo.id)
 						this.hdId = that.hdInfo.id
 						this.hdId = that.hdInfo.id
 					}
 					}
-
-					if (!that.$util.isEmpty(that.customInfo)){
-						getMemberWeal().then(ret=>{
-							if(ret.code == 1){
-								that.rechargeWeal = ret.data.rechargeWeal ? ret.data.rechargeWeal : 0
-								that.weal = ret.data.weal ? ret.data.weal : 0
-							}
-						})
-					}
 				}
 				}
 			})
 			})
 
 
@@ -320,10 +277,6 @@ export default {
 		handleConfirmRecharge() {
 		handleConfirmRecharge() {
 			this.wexinPayFn()
 			this.wexinPayFn()
 		},
 		},
-		// 显示福利选择弹框
-		showWelfareModal() {
-			this.welfareModalShow = true
-		},
 		// 处理福利弹框点击
 		// 处理福利弹框点击
 		handleWelfareModal(e) {
 		handleWelfareModal(e) {
 			// 点击遮罩层关闭弹框
 			// 点击遮罩层关闭弹框