充值

hdApp/src/admin/home/apply.vue

@@ -86,7 +86,7 @@ export default {
             { name: "商城", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/cg/mall",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/recharge/discount",pf:1},
           ]
         },
         {

hdApp/src/admin/home/workbench.vue

@@ -7,111 +7,114 @@
     </view>
   </block>
   <block v-else>
-    <div class="app-main app-content" v-if="loginStyle  == 2">
+    <view class="app-main app-content" v-if="loginStyle  == 2">
       <template v-if="lookMoney == 1">
-        <div class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home2.png)` }">
-          <div class="user-top">
-            <div class="app-size-28">今日概况</div>
-          </div>
-          <div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
-            <div>收入</div>
-            <div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
-          </div>
-          <div class="user-bottom">
-            <div class="info-list">
-              <div class="info-list-name">访客</div>
-              <div class="info-list-value">
+        <view class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home2.png)` }">
+          <view class="user-top">
+            <view class="app-size-28">今日概况</view>
+          </view>
+          <view class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
+            <view>收入</view>
+            <view class="price">{{ $util.numberFormat(data.todayData.income) }}</view>
+          </view>
+          <view class="user-bottom">
+            <view class="info-list">
+              <view class="info-list-name">访客</view>
+              <view class="info-list-value">
                 {{ $util.numberFormat(data.todayData.visit) || 0 }}
-              </div>
-            </div>
+              </view>
+            </view>
             <navigator url="/admin/home/order" open-type="switchTab" class="info-list">
-              <div class="info-list-name">订单</div>
-              <div class="info-list-value">
+              <view class="info-list-name">订单</view>
+              <view class="info-list-value">
                 {{ $util.numberFormat(data.todayData.order) || 0 }}
-              </div>
+              </view>
             </navigator>
-            <div class="info-list">
-              <div class="info-list-name">昨天</div>
-              <div class="info-list-value">
+            <view class="info-list">
+              <view class="info-list-name">昨天</view>
+              <view class="info-list-value">
                 {{ $util.numberFormat(0) || 0 }}
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
-          <div class="total-blo">
-            <div class="total-list2"> 
-              <div class="app-color-3">系统收款</div>
-              <div class="list-num">
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
+          <view class="total-blo">
+            <view class="total-list2"> 
+              <view class="app-color-3">系统收款</view>
+              <view class="list-num">
                 <view>{{countStat.systemCount||0}}</view>
                 <view>{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</view>
-              </div>
-            </div>
-            <div class="total-list2"> 
-              <div class="app-color-3">线下微信</div>
-              <div class="list-num">
+              </view>
+            </view>
+            <view class="total-list2"> 
+              <view class="app-color-3">线下微信</view>
+              <view class="list-num">
                 <view>{{countStat.kfWxCount||0}}</view>
                 <view>{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</view>
-              </div> 
-            </div>
-            <div class="total-list2"> 
-              <div class="app-color-3">现金</div>
-              <div class="list-num">
+              </view> 
+            </view>
+            <view class="total-list2"> 
+              <view class="app-color-3">现金</view>
+              <view class="list-num">
                 <view>{{countStat.cashCount||0}}</view>
                 <view>{{countStat.cashIncome?parseFloat(countStat.cashIncome):0}}</view>
-              </div> 
-            </div>
-            <div class="total-list2"> 
-              <div class="app-color-3">赊账</div>
-              <div class="list-num">
+              </view> 
+            </view>
+            <view class="total-list2"> 
+              <view class="app-color-3">赊账</view>
+              <view class="list-num">
                 <view>{{countStat.debtCount||0}}</view>
                 <view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
-              </div> 
-            </div>
-          </div>
-        </div>
+              </view> 
+            </view>
+          </view>
+        </view>
       </template>
-      <div class="module-com news-wrap">
-        <div class="news-list" v-for="(item, index) in data.notice" :key="index" @click="noticeFn(item)" >
-          <div class="news-left">
+      <view class="module-com news-wrap">
+        <view class="news-list" v-for="(item, index) in data.notice" :key="index" @click="noticeFn(item)" >
+          <view class="news-left">
             <i class="iconfont iconxiaoxi2 ling"></i>
             <span>{{ item.title }}</span>
-          </div>
-          <div class="news-right">
+          </view>
+          <view class="news-right">
             <span>{{ item.action }}</span>
             <i class="iconfont iconxiangyou"></i>
-          </div>
-        </div>
-      </div>
+          </view>
+        </view>
+      </view>
+
+      <view style="text-align: center;font-size:28upx;font-weight:bold;color:red;margin-bottom:15upx;" @click="setRecharge" v-if="shopInfo.rechargeWeal == 0">请先设置充值活动的规则</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>
       <view class="module-com">
         <view class="tabs-head_bx">
           <image @click="goKjKd()" :src="lskd1" mode="widthFix"></image>
           <image @click="goShKd()" :src="lskd2" mode="widthFix"></image>
         </view>
-        <div class="tabs-wrap">
-          <div class="tabs-list" v-for="(item, index) in tabsData" :key="index" >
-            <div @click="goPage(item)">
-              <div class="tabs-img">
+        <view class="tabs-wrap">
+          <view class="tabs-list" v-for="(item, index) in tabsData" :key="index" >
+            <view @click="goPage(item)">
+              <view class="tabs-img">
                 <img :src="`${constant.hostUrl}/image/${item.img}`" alt mode="widthFix" />
-              </div>
-              <div class="tabs-name">{{ item.name }}</div>
-            </div>
-          </div>
-        </div>
+              </view>
+              <view class="tabs-name">{{ item.name }}</view>
+            </view>
+          </view>
+        </view>
       </view>
       <template v-if="lookMoney == 1">
-        <div class="module-com total-wrap">
-          <div class="total-tit">总览</div>
-          <div class="total-blo">
-            <div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
-              <div class="list-num">{{ $util.numberFormat(item.value) }}</div>
-              <div class="app-color-3">{{ item.name }}</div>
-            </div>
-          </div>
-        </div>
+        <view class="module-com total-wrap">
+          <view class="total-tit">总览</view>
+          <view class="total-blo">
+            <view class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
+              <view class="list-num">{{ $util.numberFormat(item.value) }}</view>
+              <view class="app-color-3">{{ item.name }}</view>
+            </view>
+          </view>
+        </view>
       </template>
-    </div>
+    </view>
     <view class="order-page" v-else>
       <view class="ghs_list_page flex-col">
         <view style="background-color:white;margin-bottom:20upx;">
@@ -345,7 +348,8 @@ export default {
       countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0},
       lookMoney:1,
       currentGhs:{},
-      displaySupplierList: [] // 用于显示在弹框中的供货商列表
+      displaySupplierList: [],// 用于显示在弹框中的供货商列表
+      shopInfo:[]
     };
   },
   computed: {
@@ -399,6 +403,9 @@ export default {
 
   },
   methods: {
+    setRecharge(){
+      this.$util.pageTo({url:'/admin/recharge/discount'})
+    },
 		closeToShow(){
 			this.$refs.toShowMore.close()
 		},
@@ -453,7 +460,8 @@ export default {
 					let sjName = res.data.merchantName ? res.data.merchantName : ''
 					let shopName = res.data.shopName ? res.data.shopName : ''
 					let title = shopName == '首店' ? sjName : sjName+' '+shopName
-					 uni.setNavigationBarTitle({ title: title })
+					uni.setNavigationBarTitle({ title: title })
+          this.shopInfo = res.data?res.data:[]
 				}
 			})
 		},

hdApp/src/admin/member/detail.vue

@@ -573,7 +573,7 @@ export default {
           name: "开单",
           icon: "iconbianji",
           funtion: () => {
-			      this.$msg("开发中")
+			      this.addOrder()
           }
         }
       ],
@@ -624,6 +624,9 @@ export default {
     this.init()
   },
   methods: {
+    addOrder(){
+      this.$util.pageTo({url:'/admin/billing/index2?customId='+this.data.id+'&customName='+this.data.name})
+    },
     // 打开减余额弹框
     openDeductPopup(){
       this.$refs.deductPopupRef.open('center')
@@ -673,6 +676,8 @@ export default {
       })
     },
     beginModifyMember(){
+      this.$msg('开发中')
+      return false
 			this.$refs.memeberChangeRef.open('top')
     },
     cancelModifyMember(){

hdApp/src/admin/recharge/discount.vue

@@ -1,12 +1,6 @@
 <template>
 	<view class="app-content">
 		<view>
-
-			<view style="background-color: white;">
-				<text style="margin-right:30upx;font-size:35upx;margin-left:20upx;">充值优惠方式：</text>
-				<view :class="[rechargeWeal == 1 ? 'blue' : 'default']" class="admin-button-com big" @click="rechargeWeal=1">升会员</view>
-				<view :class="[rechargeWeal == 2 ? 'blue' : 'default']" style="margin-left:60upx;" class="admin-button-com big" @click="rechargeWeal=2">送余额</view>
-			</view>
 			<view style="background-color: white;padding-bottom:30upx;"></view>
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<view>
@@ -32,9 +26,9 @@
 				</view>
 			</t-table>
 
-			<view style="margin-top:50upx;text-align: center;" v-if="hasMemberDiscount == 0">
-				<view style="color:red;font-weight:bold;font-size:32upx;margin-bottom:20upx;">你还没有设置会员折扣，请先去设置</view>
-				<view style="margin:0 auto;" class="admin-button-com big blue" @click="setMemberDiscount">去设置会员折扣</view>	
+			<view style="margin-top:50upx;text-align: left;padding-left:10px;">
+				<view style="font-size:32upx;">充值金额请按由少到多填写</view>
+				<view style="font-size:32upx;margin-top:15upx;color:red;font-weight:bold;">客户如还有欠款未结，充值时不会有赠送，切记</view>
 			</view>
 		</view>
         <view class="app-footer">
@@ -58,7 +52,7 @@ export default {
 	data() {
 		return {
 			map:[],
-			rechargeWeal:1,
+			rechargeWeal:2,
 			hasMemberDiscount:0
 		};
 	},
@@ -67,7 +61,6 @@ export default {
 			if(res.code == 1){
 				this.map = res.data.recharge?res.data.recharge:[]
 				this.hasMemberDiscount = res.data.hasMemberDiscount ? res.data.hasMemberDiscount : 0
-				this.rechargeWeal = res.data.rechargeWeal ? res.data.rechargeWeal : 1
 			}
 		})
 	},
@@ -91,6 +84,9 @@ export default {
 				modifyRecharge({data:this.map,rechargeWeal:this.rechargeWeal}).then(res=>{
 					if(res.code == 1){
 						this.$msg(res.msg)
+						setTimeout(function(){
+							uni.navigateBack()
+						},1000)
 					}
 				})
 			})

hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const FORMALHOST = 'http://shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {