Skip to content

C
CFFP-HB
Commit a1660ed9 by yuzhenWang
Options

Merge branch 'wyz' into 'test' 

解决电脑端不能购买问题，待发生产

See merge request !129
parents 0cbc2e40 3f723f79
Showing with 34 additions and 30 deletions
common/common.ts
...@@ -199,16 +199,28 @@ export default { ...@@ -199,16 +199,28 @@ export default {
* 检测设备信息 * 检测设备信息
* deviceType:PC为1,移动端为2,微信为3 * deviceType:PC为1,移动端为2,微信为3
*/ */
// checkDeviceType() {
// let deviceType = null;
// if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
// if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
// deviceType = '3';
// } else {
// deviceType = '2';
// }
// } else {
// deviceType = '1';
// }
// return deviceType;
// },
checkDeviceType() { checkDeviceType() {
let deviceType = null; let deviceType = null;
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) { // 优先判断是否在微信环境（包含手机微信、电脑微信的 WebView）
if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) { if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
deviceType = '3'; deviceType = '3';
} else { } else if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
deviceType = '2'; deviceType = '2';
}
} else { } else {
deviceType = '1'; deviceType = '1';
} }
return deviceType; return deviceType;
}, },
......
pages.json
...@@ -129,14 +129,14 @@ ...@@ -129,14 +129,14 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ // {
"path": "pages/myLearning/myLearning", // "path": "pages/myLearning/myLearning",
"style": { // "style": {
"navigationBarTitleText": "我的学习", // "navigationBarTitleText": "我的学习",
"enablePullDownRefresh": false // "enablePullDownRefresh": false
} // }
}, // },
{ {
"path": "pages/personalCenter/myTeam", "path": "pages/personalCenter/myTeam",
"style": { "style": {
...@@ -336,13 +336,14 @@ ...@@ -336,13 +336,14 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { },
"path": "pages/learningStatistics/learningStatistics", // {
"style": { // "path": "pages/learningStatistics/learningStatistics",
"navigationBarTitleText": "学习统计", // "style": {
"enablePullDownRefresh": false // "navigationBarTitleText": "学习统计",
} // "enablePullDownRefresh": false
}, // }
// },
{ {
"path": "pages/personalCenter/system/accontsetting", "path": "pages/personalCenter/system/accontsetting",
"style": { "style": {
......
pages/orderConfirm/orderConfirm.vue
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
</view> </view>
</view> </view>
<!-- 支付方式 --> <!-- 支付方式 -->
<view class="paymentMethodContent"> <view class="paymentMethodContent">
<h4>选择支付方式</h4> <h4>选择支付方式</h4>
<view @click="selectPaymentMethod(2)"> <view @click="selectPaymentMethod(2)">
...@@ -61,17 +62,7 @@ ...@@ -61,17 +62,7 @@
<i class="iconfont icon-duihao txtFont"></i> <i class="iconfont icon-duihao txtFont"></i>
</view> </view>
</view> </view>
<!-- #ifdef APP-PLUS -->
<!-- <view class="paymentItem" @click="selectPaymentMethod(1)">
<view>
<i class="iconfont icon-py_weixinzhifu"></i>
<text>微信支付</text>
</view>
<view class="selectRadio" :class="{'actived':paymentMethod===1}">
<i class="iconfont icon-duihao"></i>
</view>
</view> -->
<!-- #endif -->
</view> </view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment