Commit fbffdd95e58c715e2ff419230274a5754e0235a1
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
3 changed files
with
24 additions
and
6 deletions
packageE/pages/cart/cart_wk/cart_wk.js
@@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
2 | var t = getApp(), | 2 | var t = getApp(), |
3 | oo = t.globalData.setting, | 3 | oo = t.globalData.setting, |
4 | os=oo; | 4 | os=oo; |
5 | -var ut=require("../../../utils/util.js"); | ||
6 | -var util_pay=require("../../../utils/pay.js"); | ||
7 | -var regeneratorRuntime = require('../../../utils/runtime.js'); | 5 | +var ut=require("../../../../utils/util.js"); |
6 | +var util_pay=require("../../../../utils/pay.js"); | ||
7 | +var regeneratorRuntime = require('../../../../utils/runtime.js'); | ||
8 | 8 | ||
9 | Page({ | 9 | Page({ |
10 | /** | 10 | /** |
packageE/pages/qy/contactMe/contactMe.js
@@ -342,6 +342,24 @@ Page({ | @@ -342,6 +342,24 @@ Page({ | ||
342 | // }); | 342 | // }); |
343 | 343 | ||
344 | }, | 344 | }, |
345 | + | ||
346 | + charuser(){ | ||
347 | + wx.navigateTo({ | ||
348 | + url: '/packageE/pages/togoin/togoin', | ||
349 | + }) | ||
350 | + // wx.showModal({ | ||
351 | + // title: '提示', | ||
352 | + // content: '当前暂未登录,是否授权登录', | ||
353 | + // complete: (res) => { | ||
354 | + // if (res.confirm) { | ||
355 | + // wx.navigateTo({ | ||
356 | + // url: '/packageE/pages/togoin/togoin', | ||
357 | + // }) | ||
358 | + // } | ||
359 | + // } | ||
360 | + // }) | ||
361 | + }, | ||
362 | + | ||
345 | async befgetqy() { | 363 | async befgetqy() { |
346 | wx.showLoading({ | 364 | wx.showLoading({ |
347 | title: '加载中', | 365 | title: '加载中', |
packageE/pages/qy/contactMe/contactMe.wxml
@@ -25,10 +25,10 @@ | @@ -25,10 +25,10 @@ | ||
25 | 25 | ||
26 | <!-- 授权获取基础信息 --> | 26 | <!-- 授权获取基础信息 --> |
27 | <block > | 27 | <block > |
28 | - <button hidden="{{user}}" open-type="getPhoneNumber" class="getPhoneNumber" bindgetphonenumber="getphone"> | 28 | + <button hidden="{{user}}" class="getPhoneNumber" catchtap="charuser"> |
29 | <view class="flex flex-center ali-c"> | 29 | <view class="flex flex-center ali-c"> |
30 | - <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> | ||
31 | - <view>立即授权获取手机号码</view> | 30 | + <!-- <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> --> |
31 | + <view>暂未登录请授权登录</view> | ||
32 | </view> | 32 | </view> |
33 | </button> | 33 | </button> |
34 | </block> | 34 | </block> |