merge code

app.json

@@ -50,7 +50,7 @@
         "iconPath": "./image/tabbar/phone.png",
         "selectedIconPath": "./image/tabbar/phoned.png",
         "pagePath": "pages/postage/postage",
-        "text": "油费"
+        "text": "加油"
       },
       {
         "iconPath": "./image/tabbar/me.png",

pages/components/auth/auth.wxml

@@ -4,6 +4,7 @@
     <view>您暂未获取微信授权，将无法领取红包、加入购物车、下单等功能。点击“授权登录”后，您将使用全部功能。</view>
   </view>
   <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">授权手机号码</button>
-  <button style='margin-top:160rpx;width:82%;height: 92rpx;background: #2b2b2b;color: #fff;' open-type="getUserInfo"
-    bindgetuserinfo="userInfoHandler">授权登录</button>
+  <button style='margin-top:160rpx;width:82%;height: 92rpx;background: #2b2b2b;color: #fff;' 
+          open-type="getUserInfo"
+          bindgetuserinfo="userInfoHandler">授权登录</button>
 </view>

pages/confirmVOrder/confirmVOrder.js

@@ -121,10 +121,10 @@ Page({
         let pay_sn = res.datas.pay_sn
         wx.requestPayment({
           timeStamp: param.timeStamp, //时间戳，自1970年以来的秒数
-          nonceStr: param.nonceStr, //随机串
+          nonceStr: param.nonceStr,   //随机串
           package: param.package,
           signType: param.signType, //微信签名方式：
-          paySign: param.paySign, //微信签名
+          paySign: param.paySign,   //微信签名
           success: function (res) {
             wx.reLaunch({
               url: "/pages/index/index"

pages/postage/postage.js

@@ -21,9 +21,9 @@ Page({
         "text": "25288888556"
     }],
     gearData: [
-      { faceValue: 100, price: 95 },
-      { faceValue: 200, price: 190 },
-      { faceValue: 500, price: 475 },
+      { faceValue: 100,  price: 95  },
+      { faceValue: 200,  price: 190 },
+      { faceValue: 500,  price: 475 },
       { faceValue: 1000, price: 950 }
     ]
   },

pages/postage/postage.wxml

@@ -1,7 +1,6 @@
 <!--pages/address/address.wxml-->
 <view class="postage">
   <view class="tips">您好！尊敬的会员，您正享受商城促销活动9.6折</view>
-
   <!-- 选择油卡 -->
   <view class="tabs" wx:if="{{tabsData.length}}">
     <view class="tabs-title">