stanley-king 4 роки тому
батько
коміт
a1212b53c1

+ 12 - 14
app.js

@@ -4,7 +4,6 @@ import WxAuthor from './utils/WxAuthor'
 
 App({
     onLaunch: function() {
-
         // 用户版本更新
       if (wx.canIUse("getUpdateManager")) {
         let updateManager = wx.getUpdateManager();
@@ -36,20 +35,19 @@ App({
           });
         });
       }
+      
+      let self = this;
+      // 登录
+      this.mWxAuthor = new WxAuthor(self,true)
+      const dirs = ['addAddress','address','myhome','confirmOrder','confirmVOrder',
+      'order_tabs','orderPaySn','person','postageDetail','postageManage','shopCart'];
 
-
-        let self = this;
-        // 登录
-        this.mWxAuthor = new WxAuthor(self,true)
-        const dirs = ['addAddress','address','myhome','confirmOrder','confirmVOrder',
-        'order_tabs','orderPaySn','person','postageDetail','postageManage','shopCart'];
-
-        let pages = new Set()
-        dirs.forEach(dir => {
-            let page = `/pages/${dir}/${dir}`   
-            pages.add(page)
-        });
-        this.globalData.authPages = pages    
+      let pages = new Set()
+      dirs.forEach(dir => {
+        let page = `/pages/${dir}/${dir}`   
+        pages.add(page)
+      });
+      this.globalData.authPages = pages    
     },    
     globalData: {
         fMinistart: false,

+ 27 - 3
pages/postageDetail/postageDetail.js

@@ -25,18 +25,28 @@ Page({
     if(!card_no) {
       app.showToast('卡号不能为空')
       return
-    }else if(card_type ==='phone' && !this.checkPhone(card_no)){
+    } 
+    else if(card_type ==='phone' && !this.checkPhone(card_no)){
       app.showToast('请输入正确的手机号码')
       return
     }
+    else if(card_type ==='petrochina' && !this.checkPetrochina(card_no)){ //中国石油
+      app.showToast('请输入正确的手机号码')
+      return
+    }
+    else if(card_type ==='sinopec' && !this.checkSinopec(card_no)){ //中国石化
+      app.showToast('请输入正确的手机号码')
+      return
+    }
+
     if(!confirm_card_no) {
       app.showToast('请再次输入卡号')
       return
-    }else if(card_no !== confirm_card_no) {
+    } else if(card_no !== confirm_card_no) {
       app.showToast('两次输入的卡号不一致')
       return
     }
-   
+
     this.handleSubmit(e.detail.value)
   },
 
@@ -76,6 +86,20 @@ Page({
   }
     return true
  },
+ checkPetrochina(card_no)
+ { 
+    if(!(/^[9][0-9]{15}$/.test(card_no))){
+    return false;
+  }
+    return true
+ },
+ checkSinopec(phone)
+ { 
+    if(!(/^[1][0-9]{18}$/.test(card_no))){
+    return false;
+  }
+    return true
+ },
 
   /**
    * 生命周期函数--监听页面加载

+ 2 - 1
pages/postageDetail/postageDetail.wxml

@@ -32,7 +32,8 @@
   <view wx:if="{{card_type!=='phone'}}">
     <view class="form-control form-control-flex">
       <text class="form-label" space="emsp" decode="true">卡  号</text>:
-      <input class="input-control" type="number" name="card_no" value="{{card_no}}"/>
+      <input wx:if="{{card_type === 'sinopec'}}" class="input-control" type="number" name="card_no" value="{{card_no || '请输入以1开头的19位中石化加油卡号'}}"/>
+      <input wx:if="{{card_type === 'petrochina'}}" class="input-control" type="number" name="card_no" value="{{card_no || '请输入以9开头的16位中石油加油卡号' }}"/>
     </view>
     <view class="form-control form-control-flex">
       <text class="form-label">确认卡号</text>:

+ 7 - 4
pages/postageDetail/postageDetail.wxss

@@ -116,9 +116,6 @@
   color: #828282;
 }
 
-
-
-
 .animation-element {
   display: flex;
   position: fixed;
@@ -135,7 +132,6 @@
   align-items:center;
 }
 
-
 .left-bt{
   left: 30rpx;
 }
@@ -232,4 +228,11 @@
 .radiobox-title{
   padding: 0 40rpx;
   color: #5e5e5e;
+}
+
+.card-no {
+  height: 70rpx;
+  line-height: 70rpx;
+  font-size: 28rpx;
+  color: #2b2b2b;
 }

+ 3 - 1
utils/WxAuthor.js

@@ -1,5 +1,6 @@
 const getReq = require('../config.js').getReq
 const api    = require('../config.js').host
+var ald = require('./ald-stat.js')
 
 export default class WxAuthor {
   fGetSetting = true
@@ -11,10 +12,10 @@ export default class WxAuthor {
   // 首先wx.login
   init(getsetting) {
     this.target.globalData.fMinistart = false
-
     this.fGetSetting = getsetting
     wx.login({
       success: res => {
+        console.log('wx.login code:',res)
         this.ministart(res.code)
       }
     })
@@ -32,6 +33,7 @@ export default class WxAuthor {
         let { openid, unionid } = res.datas
         if (openid && unionid) {
           this.setId(openid, unionid)
+          wx.aldstat.sendOpenid(openid)
           if(this.fGetSetting) {
             this.getSetting(false)
           }

+ 1 - 1
utils/ald-stat-conf.js

@@ -2,4 +2,4 @@
 // 具体配置项填写方式可参考doc.aldwx.com-小程序统计平台或广告监测平台-快速接入指南
 exports.app_key = "78659cad8a9b88cea7cc274699482236"; // 在此处填写小程序统计/广告监测平台创建小程序后生成的app_key。必填项
 exports.plugin = false; // 您的小程序中是否使用了插件。根据是否启用插件会有不同的接入方式,请参考文档。默认不更改
-exports.useOpen = false; // 开启OpenID上报选项,需要额外进行配置,具体参考文档。默认不更改
+exports.useOpen = true; // 开启OpenID上报选项,需要额外进行配置,具体参考文档。默认不更改