Merge branch 'oil' of 39.97.239.116:gyfl/minixyz into oil

* 'oil' of 39.97.239.116:gyfl/minixyz:
  debug

# Conflicts:
#	pages/postage/postage.wxml

config.js

@@ -1,8 +1,8 @@
 // let api = "https://passport.lrlz.com/mobile/index.php";
 // let api = "http://www.xyzshops.cn/mobile/index.php";
-// let api = "http://192.168.1.200/mobile/index.php";
+let api = "http://192.168.1.200/mobile/index.php";
 // let api = "https://www.xyzshops.cn/mobile/index.php";
-let api = "http://www.xyzshops.cn/mobile/index.php";
+// let api = "http://www.xyzshops.cn/mobile/index.php";
 
 
 function getReq(app,data, callback, method)

pages/phoneCharges/phoneCharges.wxml

@@ -42,7 +42,7 @@
 
   <view class="rechargeGear-footer" style="background:transparent;padding:0;">
 		<view class="btn-rechargeNow btn-rechargeNow___share" bindtap="onShowShareDialog">
-			<text>分享好友</text>
+			<text>领取补贴</text>
 		</view>
 		<view class="btn-rechargeNow" bindtap="handlerRecharge">
 			<text>充值</text>

pages/postage/postage.js

@@ -23,6 +23,8 @@ Page({
     petrochina: { card_no: '', card_type: 'petrochina' },    
     phone: { card_no: '', card_type: 'phone' },
 
+    member_mobile:'',
+
     tabsData: [
       { id: 0, icon: '/image/postage/sinopec.png', title: '中国石化',  tips: '选择油卡',   card_type: 'sinopec',    card_no: '' },
       { id: 1, icon: '/image/postage/petrochina.png', title: '中国石油', tips: '选择油卡', card_type: 'petrochina', card_no: '' }
@@ -51,9 +53,20 @@ Page({
   },
 
   onShowPayInfoModal(){
+    let lines = [
+      '1、本服务为全国加油卡代充服务、故 不提供充值发票；',
+      '2、支付成功后，需收到充值成功通知短信后，方可到 加油站圈存后加油使用；',
+      '3、每用户（手机号、设备号、加油卡号）每月最多能充2000且至多充值15笔；',
+      '4、不支持副卡、增票卡、过期卡、黑名单卡、挂失卡、注销卡、电子卡、车队卡等特殊卡种；',
+      '5、中石油不支持第三方虚拟手机号段充值；',
+      '6、充值操作以油卡卡号为准，请认真填写，如因填写卡号有误而导致充值不成功或误充值，相关后果由本人承担；',
+      '7、短信通知号码的收集仅用于后期充值信息的发送使用，特此说明；'
+    ]
+    let content = lines.join("\r\n");
+
     wx.showModal({
       title: '充值代缴服务说明',
-      content: '充值代缴服务说明',
+      content: content,
       showCancel:false,
       success (res) {
         if (res.confirm) {
@@ -62,8 +75,7 @@ Page({
           console.log('用户点击取消')
         }
       }
-    })
-    
+    })    
   },
 
   // 页签切换
@@ -94,6 +106,14 @@ Page({
     app.navigateto(`/pages/postageManage/postageManage?card_type=${cardtype}`)
   },
 
+  onAuthenPhone()
+  {
+    if (!app.globalData.hasmobile) {
+      app.navigateto('/pages/auth/auth')
+      return;
+    }
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -123,7 +143,7 @@ Page({
           const datas = res.datas
 
           let goods_inviter_tips = this.formGoodsInviterTips(res.datas.goods_inviter_tips)
-          const { tips = '', goods = [], cards = [], } = datas
+          const { tips = '', goods = [], cards = [], member_mobile} = datas
 
           let phone = app.getValueByKey('phone', cards)
           let petrochina = app.getValueByKey('petrochina', cards)
@@ -135,7 +155,7 @@ Page({
 
           let goods_id = datas.goods[0].goods_id
           let inviter_tip = goods_inviter_tips.get(goods_id)
-          this.setData({ tips, goods_inviter_tips, inviter_tip, goods, sinopec, petrochina, phone, goods_id });
+          this.setData({tips, goods_inviter_tips, inviter_tip, goods, sinopec, petrochina, phone, goods_id, member_mobile});
         }
       }
       else {

pages/postage/postage.wxml

@@ -18,7 +18,8 @@
 				</view>
 			</view>
 			<view class="bindMobileLabel">手机号码</view>
-			<view class="bindMobile">短信接收号码</view>
+			<view class="bindMobile" wx:if="{{member_mobile == ''}}" bindtap="onAuthenPhone">输入手机号码</view>
+		 	<view class="bindMobile" wx:if="{{member_mobile != ''}}">{{member_mobile}}</view>
 		</view>
 		<view class="tabContent">
 			<view class="tabs-content" wx:for="{{tabsData}}" wx:key="index" style='display:{{currentIndex !== index ? "none" : "block"}}'>
@@ -39,7 +40,7 @@
 
 	<!--充值金额 -->
 	<view class="rechargeGear" wx:if="{{goods.length}}">
-		<view class="rechargeGear-title">充值金额</view>
+		<view class="rechargeGear-title">充值面额</view>
 		<view class="rechargeGear-content">
 			<view class="rechargeGear-content__item {{rechargeGearActiveIndex == index ? 'active' : ''}}" wx:for="{{goods}}" wx:key="index" bindtap="handlerClickRechargeGear" data-activeindex="{{index}}" data-currentvalue="{{item.goods_id}}">
 				<view class="faceValue">{{item.goods_spec}}</view>
@@ -61,7 +62,7 @@
 
 	<view class="rechargeGear-footer">
 		<view class="btn-rechargeNow btn-rechargeNow___share" bindtap="onShowShareDialog">
-			<text>分享好友</text>
+			<text>领取补贴</text>
 		</view>
 		<view class="btn-rechargeNow" bindtap="handlerRecharge">
 			<text>充值</text>