merge develop and remove wellness tab

app.json

@@ -22,7 +22,6 @@
     "pages/projects/project-success/project-success",
 	"pages/projects/project-search/project-search",
     "pages/pay/pay",
-    "pages/wellness/wellness",
     "pages/customservice/customservice",
     "pages/web/web",
     "pages/parse/parse",
@@ -94,14 +93,6 @@
         "pages/merchant/logistics/logistics",
         "pages/merchant/accounts/accounts"
       ]
-    },
-    {
-      "root": "packageWellness",
-      "pages": [
-        "pages/tcm/diagnosis/diagnosis",
-        "pages/tcm/report/report",
-        "pages/tcm/user-form/user-form"
-      ]
     }
   ],
   "preloadRule": {
@@ -142,10 +133,10 @@
         "text": "购物车"
       },
       {
-        "iconPath": "images/footer/wellness.png",
-        "selectedIconPath": "images/footer/wellnessc.png",
-        "pagePath": "pages/wellness/wellness",
-        "text": "康养"
+        "iconPath": "images/footer/weixin.png",
+        "selectedIconPath": "images/footer/weixinc.png",
+        "pagePath": "pages/customservice/customservice",
+        "text": "客服"
       },
       {
         "iconPath": "images/footer/my.png",

packageUser/pages/user/cash/cash.json

@@ -1,7 +1,7 @@
 {
-  "navigationBarTitleText": "佣金",
+  "navigationBarTitleText": "余额",
   "usingComponents": {
     "format-time": "../../../../component/formatTime/formatTime"
   },
   "backgroundColor": "#f3f3f3"
-}
+}

packageUser/pages/user/cash/cash.wxml

@@ -1,14 +1,14 @@
 <view class="bg">
   <view class="radish-top">
 	<view class="wd-list" bindtap="goWithdrawClick">提现记录</view>
-    <view class="radish-top__title">我的佣金</view>
+    <view class="radish-top__title">我的余额</view>
     <view class="radish-top__count">{{balance / 100}}</view>
 	<view class="radish-top__btn22" bindtap="getBankInfoAndTip">点击提现</view>
     <!--<navigator url="/packageUser/pages/user/exchange/exchange" >
-      <view class="radish-top__btn">兑换佣金</view>
+	      <view class="radish-top__btn">兑换余额</view>
     </navigator>-->
-    <navigator url="/packageUser/pages/user/buy/buy" >
-      <view class="radish-top__btn1">购买佣金</view>
+    <navigator url="/packageUser/pages/user/recharge/recharge" >
+      <view class="radish-top__btn1">充值余额</view>
     </navigator>
   </view>
   <view class="radish-main">
@@ -19,7 +19,7 @@
         <view class="radish-main__time"><format-time type="formatTime" value="{{item.ctime}}" ></format-time></view>
         <view class="clean"></view>
       </view>
-      <view class="radish-main__count">{{item.count / 100}}佣金</view>
+      <view class="radish-main__count">{{item.count / 100}}余额</view>
     </view>
   </view>
   

packageUser/pages/user/cashDetail/cashDetail.json

@@ -1,6 +1,6 @@
 {
-  "navigationBarTitleText": "佣金",
+  "navigationBarTitleText": "余额",
   "usingComponents": {
     "format-time": "../../../../component/formatTime/formatTime"
   }
-}
+}

packageUser/pages/user/cashDetail/cashDetail.wxml

@@ -2,7 +2,7 @@
   <view class="radishDetail">
     <view class="radishDetail-count">
       <view class="radishDetail-count__title">数量</view>
-      <view class="radishDetail-count__value">{{detail.count / 100}}佣金</view>
+      <view class="radishDetail-count__value">{{detail.count / 100}}余额</view>
       <view class="clean"></view>
     </view>
     <view class="radishDetail-line">
@@ -21,7 +21,7 @@
       <view class="clean"></view>
     </view>
 <!--     <view class="radishDetail-line">
-      <view class="radishDetail-line__title">剩余佣金</view>
+      <view class="radishDetail-line__title">剩余余额</view>
       <view class="radishDetail-line__value ellipsis">此字段接口无返回</view>
       <view class="clean"></view>
     </view> -->

packageUser/pages/user/invite/contribution/contribution.wxml

@@ -29,7 +29,7 @@
     <view class="con-no-top">您还不是合伙人?</view>
     <view class="con-no-main">
       <view class="con-no-maintext">正式成为合伙人 ,</view>
-      <view class="con-no-maintext1">享<text style="color:#fe685a">额外1%</text>商品佣金及<text style="color:#fe685a">二级分佣资格</text>有福利 !</view>
+      <view class="con-no-maintext1">享<text style="color:#fe685a">额外1%</text>商品余额及<text style="color:#fe685a">二级分佣资格</text>有福利 !</view>
       <view class="con-no-maintext2">同时将有机会享有<text style="color:#fe685a">凤凰菁选商城股份</text> !</view>
       <view class="con-no-mainbtn" bindtap="becomepartner" wx:if="{{!itshow}}">成为合伙人</view>
       <view class="con-no-mainbtn" style="background:#ccc" wx:if="{{itshow}}">成为合伙人</view>
@@ -81,4 +81,4 @@
     <view class="p-nobtn" bindtap="hidedialog">暂 不 参 与</view>
   </view>
   <view class="p-bg"></view>
-</view>
+</view>

packageUser/pages/user/order/order.wxml

@@ -115,8 +115,8 @@
 	      </view>
 		  
 		  <view style="overflow: hidden;width: 100%;">
-			<view class="orderDetail-payPrice__title">佣金抵扣</view>
-			<text class="orderDetail-payPrice__count">-{{order.paied_cash / 100}}佣金</text>
+			<view class="orderDetail-payPrice__title">余额抵扣</view>
+			<text class="orderDetail-payPrice__count">-{{order.paied_cash / 100}}余额</text>
 		  </view>
 				  
 				  

packageUser/pages/user/radish/radish.json

@@ -1,7 +1,7 @@
 {
-  "navigationBarTitleText": "佣金",
+  "navigationBarTitleText": "提货券",
   "usingComponents": {
     "format-time": "../../../../component/formatTime/formatTime"
   },
   "backgroundColor": "#f3f3f3"
-}
+}

packageUser/pages/user/silver/silver.wxml

@@ -3,10 +3,10 @@
     <view class="radish-top__title">我的银豆</view>
     <view class="radish-top__count">{{balance / 100}}</view>
     <!--<navigator url="/packageUser/pages/user/exchange/exchange" >
-      <view class="radish-top__btn">兑换佣金</view>
+      <view class="radish-top__btn">兑换余额</view>
     </navigator>-->
     <!-- <navigator url="/packageUser/pages/user/buy/buy" >
-      <view class="radish-top__btn1">购买佣金</view>
+      <view class="radish-top__btn1">充值余额</view>
     </navigator> -->
   </view>
   <view class="silver-help-height"></view>

packageUser/pages/user/silverDetail/silverDetail.wxml

@@ -21,7 +21,7 @@
       <view class="clean"></view>
     </view>
 <!--     <view class="radishDetail-line">
-      <view class="radishDetail-line__title">剩余佣金</view>
+      <view class="radishDetail-line__title">剩余余额</view>
       <view class="radishDetail-line__value ellipsis">此字段接口无返回</view>
       <view class="clean"></view>
     </view> -->

packageUser/pages/user/transfer/transfer.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "佣金转换",
+  "navigationBarTitleText": "余额转换",
   "backgroundColor": "#f3f3f3"
-}
+}

packageUser/pages/user/transfer/transfer.wxml

@@ -22,7 +22,7 @@
     </button>
     <p class="submittips">说明：</p>
     <p class="submittips">1.转账后 请到 <a bindtap="toTransferList" style="color: #eab86a;">转账明细</a> 查看明细。</p>
-    <p class="submittips">2.转账将扣除相应金额的佣金，增加转帐金额2倍的提货券。</p>
+    <p class="submittips">2.转账将扣除相应金额的余额，增加转帐金额2倍的提货券。</p>
     
   </form>
 </view>

packageUser/pages/user/transfer/transferList/transferList.wxml

@@ -23,7 +23,7 @@
 
     <view class="withdraw-info" wx:key="{{index}}" wx:for="{{cashList}}">
       <view class="withdraw-goods">
-        <view class="name"><!-- 【{{item.source_name}}】{{item.remark}} -->佣金转提货券
+        <view class="name"><!-- 【{{item.source_name}}】{{item.remark}} -->余额转提货券
         <view class="money"><currency  value="{{item.count}}" ></currency>元</view>
         </view>
         <view class="clean"></view>
@@ -38,4 +38,4 @@
     </view>
   </view>
 
-</view>
+</view>

pages/pay/pay.js

@@ -45,7 +45,7 @@ Page({
 	pickid:0,
 	has_unuse_quan:false,
 	use_silver:0,
-	pay_cash:0,//佣金抵扣
+	pay_cash:0,//余额抵扣
 	freight_limit:9900,
 	unquan_silver:0,//不能使用提货券抵扣的银豆
 	
@@ -822,7 +822,7 @@ Page({
      var params = {
 		'order_id':that.data.orderId,
 		'use_coupon':true, //是否使用提货券
-		'use_balance':that.data.useCash, //是否使用佣金
+		'use_balance':that.data.useCash, //是否使用余额
 		'pick_way':that.data.receivetype, //自提方式
      }
      var success = function (res) {

pages/pay/pay.wxml

@@ -176,7 +176,7 @@
 	<view class="pay-payway-item" wx:if="{{cashInfo.available > 0 && payData.pay_way == ''}}">
 		<view class="pay-payway-balance fl">
 	      <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/yongjin.png"></image>
-	      <text >佣金抵扣 （剩余：{{cashInfo.available / 100}}）</text>
+	      <text >余额抵扣 （剩余：{{cashInfo.available / 100}}）</text>
 	    </view>
 	    <view class="fr pay-balance-cash" wx:if="{{!payData.shut_wechat}}">
 			<!-- <text class="pay-circle">
@@ -299,10 +299,10 @@
 	  
 	  <!-- <view wx:if="{{payData.paied_cash>0 || pay_cash>0}}"> -->
 		  <view wx:if="{{payQueryData && payQueryData['FirstPay'] && useCash}}" style="padding:15rpx;text-align:right">
-			使用佣金抵扣 <text style="color:#F00">-{{payQueryData['PayBalance'] / 100}}</text> 佣金
+			使用余额抵扣 <text style="color:#F00">-{{payQueryData['PayBalance'] / 100}}</text> 余额
 		  </view>
 		  <view wx:if="{{payQueryData && !payQueryData['FirstPay']}}" style="padding:15rpx;text-align:right">
-			使用佣金抵扣 <text style="color:#F00">-{{payData.paied_cash/100}}</text> 佣金
+			使用余额抵扣 <text style="color:#F00">-{{payData.paied_cash/100}}</text> 余额
 		  </view>
 	  <!-- </view> -->
 	  
@@ -399,4 +399,4 @@
     <view class="btn-confirm" bindtap="onConfirm" data-status="confirm">前往兑换</view>
   </view>
 </view>
--->
+-->

pages/user/all/all.js

@@ -448,7 +448,7 @@ console.log('getUserProfile')
     var params = {
     }
     var success = function (res) {
-      var result = res.data.total
+      var result = res.data.available
       that.setData({
         cashbalance: result
       })

pages/user/all/all.wxml

@@ -1,6 +1,6 @@
 <!--登陆界面-->
 <view class="logindiv" wx:if="{{userInfo == 'nologin'}}">
-	<image class="logindiv_image" src="https://cfohow.hiwavo.com/xcx/xcx/start.png"></image>
+	<image class="logindiv_image" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/xcx/start.png"></image>
 	<!-- 旧版弃用 -->
     <!-- <button class="loginbtn" bindtap="getUserProfile">微信授权登陆</button> -->
     <!-- <button class="loginbtn" open-type="getUserInfo" bindgetuserinfo="getUserInfo">微信授权登陆</button> -->
@@ -24,7 +24,7 @@
 
 <view class="user">
   <view class="user-top">
-    <image src="https://cfohow.hiwavo.com/xcx/image/icon/parner.png" class="user-par" wx:if="{{checkData.copartner_state == 1}}" />
+    <image src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/parner.png" class="user-par" wx:if="{{checkData.copartner_state == 1}}" />
     <view class="user-name ellipsis">{{userInfo.nickname}}</view>
     
     <button class="user-title" wx:if="{{userInfo == 'nologin'}}" bindtap="getUserProfile" style="font-size: 18px;margin-top: -20px;">立即登陆</button>
@@ -49,24 +49,29 @@
     <view class="user-radishbg">
 		<view class="user-points" bindtap="toSilver">
 		  <view class="user-points__title">我的银豆</view>
-		  <image class="user-points__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+		  <image class="user-points__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 		  <view class="user-points__num">{{silver / 100}}</view>
 		</view>
       <!-- <view class="user-points" bindtap="toIntegral">
         <view class="user-points__title">我的积分</view>
-        <image class="user-points__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-points__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
         <view class="user-points__num">{{integral / 100}}</view>
       </view> -->
-	  <!-- <view class="user-points" bindtap="toCashList">
-		  <view class="user-points__title">我的收入</view>
-		  <image class="user-points__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
-		  <view class="user-points__num">{{cashbalance / 100}}</view>
-		</view> -->
-      <view class="user-points" bindtap="toRadish">
-        <view class="user-points__title">我的提货券</view>
-        <image class="user-points__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
-        <view class="user-points__num">{{balance / 100}}</view>
-      </view>
+		  <!-- <view class="user-points" bindtap="toCashList">
+		    <view class="user-points__title">我的余额</view>
+		    <image class="user-points__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+		    <view class="user-points__num">{{cashbalance / 100}}</view>
+		  </view> -->
+	      <view class="user-points" bindtap="toRadish">
+	        <view class="user-points__title">我的提货券</view>
+	        <image class="user-points__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+	        <view class="user-points__num">{{balance / 100}}</view>
+	      </view>
+	      <view class="user-points" bindtap="toCash">
+	        <view class="user-points__title">我的余额</view>
+	        <image class="user-points__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+	        <view class="user-points__num">{{cashbalance / 100}}</view>
+	      </view>
       <view class="user-luobo">
       <!--
         <navigator url="/packageUser/pages/user/exchange/exchange">
@@ -88,32 +93,32 @@
       <navigator url="/packageUser/pages/user/orders/orders" >
         <view class="user-line">
           <view class="user-line__title">我的订单</view>
-          <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+          <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
         </view>
       </navigator>
       -->
       <view class="user-state" bindtap="checkbindtel">
         <navigator url="/packageUser/pages/user/orders/orders" >
           <view class="user-dingdan">
-            <image class="user-paid__icon" src="https://cfohow.hiwavo.com/xcx/icon/dingdan.png"></image>
+            <image class="user-paid__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/dingdan.png"></image>
             <view class="user-paid__text">我的订单</view>
           </view>
         </navigator>
         <navigator url="/packageUser/pages/user/orders/orders?type=unpay" >
           <view class="user-paid">
-            <image class="user-paid__icon" src="https://cfohow.hiwavo.com/xcx/user/paid.png"></image>
+            <image class="user-paid__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/paid.png"></image>
             <view class="user-paid__text">待支付</view>
           </view>
         </navigator>
         <navigator url="/packageUser/pages/user/orders/orders?type=processing" >
           <view class="user-deliver">
-            <image class="user-paid__icon" src="https://cfohow.hiwavo.com/xcx/user/deliver.png"></image>
+            <image class="user-paid__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/deliver.png"></image>
             <view class="user-deliver__text">待发货</view>
           </view>
         </navigator>
         <navigator url="/packageUser/pages/user/orders/orders?type=dispatch" >
           <view class="user-collect">
-            <image class="user-collect__icon" src="https://cfohow.hiwavo.com/xcx/user/collect.png"></image>
+            <image class="user-collect__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/collect.png"></image>
             <view class="user-collect__text">待收货</view>
           </view>
         </navigator>
@@ -124,13 +129,13 @@
     <view class="user-padding">
       <navigator url="/packageUser/pages/user/farm/farm" >
         <view class="user-farm">
-          <image class="user-farm__icon" src="https://cfohow.hiwavo.com/xcx/icon/farm.png"></image>
+          <image class="user-farm__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/farm.png"></image>
           <view class="user-farm__text">我的团购</view>
         </view>
       </navigator>
       <navigator url="/packageUser/pages/user/granary/granary">
         <view class="user-granary">
-          <image class="user-granary__icon" src="https://cfohow.hiwavo.com/xcx/icon/granary.png"></image>
+          <image class="user-granary__icon" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/granary.png"></image>
           <view class="user-granary__text">我的粮仓</view>
         </view>
       </navigator>
@@ -142,69 +147,69 @@
 		<!--
 		<view class="user-line" bindtap="toPromotion">
 		  <view class="user-line__title">我的赠券</view>
-		  <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+		  <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 		</view>
 		-->
       <!-- <view class="user-line" bindtap="toInviteList">
         <view class="user-line__title">我的推广</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
-      <view class="user-line" bindtap="toCash" style="border:0;" wx:if="{{userInfo.show_invite_mode}}">
-        <view class="user-line__title">我的收入</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
-      </view>
-	  <view class="user-line" bindtap="toCommission" style="border:0;" wx:if="{{userInfo.tc_bl>0}}">
-	    <view class="user-line__title">我的提成</view>
-	    <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+		  <view class="user-line" bindtap="toCommission" style="border:0;" wx:if="{{userInfo.tc_bl>0}}">
+		    <view class="user-line__title">我的提成</view>
+		    <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 	  </view>
     </view>
     <view class="user-padding">
       <!-- <view class="user-line" bindtap="toBindOldSys" wx:if="{{info.wx_user.can_bind}}">
         <view class="user-line__title">旧系统用户绑定</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
       
       <!-- <view class="user-line" bindtap="toIdentity">
         <view class="user-line__title">会员认证</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
+      </view> -->
+      <!-- <view class="user-line" bindtap="toBankInfo">
+        <view class="user-line__title">银行信息</view>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
       <view class="user-line" bindtap="toAddressList">
         <view class="user-line__title">收货地址</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
 	  <view class="user-line" bindtap="toCanteen" wx:if="{{info['user']['employ']}}">
 	    <view class="user-line__title">员工订餐</view>
-	    <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+	    <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 	  </view>
       <!--<view class="user-line" bindtap="toSafe" >
         <view class="user-line__title">修改交易密码</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>-->
       <!--
       <view class="user-line" bindtap="toApplyLeader" >
         <view class="user-line__title">团长申请</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
       <view class="user-line" bindtap="toAreaCart" >
         <view class="user-line__title">店铺专区</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
       -->
       <!-- <view class="user-line" bindtap="toProxy" wx:if="{{userInfo.rank == 3}}">
         <view class="user-line__title">我的代理</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
      <!-- <view class="user-line" bindtap="toCustom" >
         <view class="user-line__title">联系客服</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view> -->
 	 <button class="user-line" open-type="contact" >
         <view class="user-line__title">联系客服</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </button>
 	  <!-- <button class="user-line" bindtap="tiggerQR" >
 	    <view class="user-line__title">联系客服</view>
-	    <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+	    <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 	  </button>-->
 	  <view class="kfqr-dialog" wx:if="{{showqr}}" bindtap="tiggerQR">
 	  	<view class="kfqr" catchtap="catchtapQR">
@@ -215,7 +220,7 @@
       <!--
       <view class="user-line" bindtap="toAbout" style="border:0;">
         <view class="user-line__title">关于商城</view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
       -->
     </view>
@@ -223,19 +228,19 @@
       <view class="user-line" bindtap="toMerchant" style="{{checkData.is_super_admin ? 'margin-top: 20rpx;':'margin-top: 20rpx;border:0;'}}">
         <view class="user-line__title">订单管理</view>
         <view class="user-line__merchant"></view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
         <view class="user-line__merchantNum" wx:if="{{merchant}}">{{merchant.list_count}}</view>
       </view>
       <view class="user-line" bindtap="toMerchant1" style="border:0;" wx:if="{{checkData.is_super_admin}}">
         <view class="user-line__title">结算管理</view>
         <view class="user-line__merchant1"></view>
-        <image class="user-line__right" src="https://cfohow.hiwavo.com/xcx/user/right.png"></image>
+        <image class="user-line__right" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
     </view> -->
   </view>
   <!--
   <view class="unbind" wx:if="{{!bindTel}}">
-    <image class="unbind-img" src="https://cfohow.hiwavo.com/xcx/user/bindtel.png"></image>
+    <image class="unbind-img" src="https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/bindtel.png"></image>
     <view class="unbind-title">你还没绑定手机号</view>
     <view class="unbind-about">兑换产品前要确定绑定了手机哦！</view>
     <view class="unbind-btn" bindtap="toBindTel">去绑定</view>

pages/user/all/all.wxss

@@ -267,7 +267,7 @@
   margin-top: 30rpx;
   margin-left: 18rpx;
   background-size: 100% 100%;
-  background-image: url('https://cfohow.hiwavo.com/xcx/user/merchant.png');
+  background-image: url('https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/merchant.png');
 }
 .user-line__merchant1 {
   float: left;
@@ -276,7 +276,7 @@
   margin-top: 30rpx;
   margin-left: 18rpx;
   background-size: 100% 100%;
-  background-image: url('https://cfohow.hiwavo.com/xcx/icon/account_icon.jpg');
+  background-image: url('https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/account_icon.jpg');
 }
 .user-line__merchantNum {
   float: right;