Commit 3f723f79 by yuzhenWang

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

parent 43e21fbf
......@@ -199,16 +199,28 @@ export default {
* 检测设备信息
* 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() {
let deviceType = null;
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
// 优先判断是否在微信环境(包含手机微信、电脑微信的 WebView)
if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
deviceType = '3';
} else {
} else if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
deviceType = '2';
}
} else {
deviceType = '1';
deviceType = '1';
}
return deviceType;
},
......
......@@ -129,14 +129,14 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/myLearning/myLearning",
"style": {
"navigationBarTitleText": "我的学习",
"enablePullDownRefresh": false
}
// {
// "path": "pages/myLearning/myLearning",
// "style": {
// "navigationBarTitleText": "我的学习",
// "enablePullDownRefresh": false
// }
},
// },
{
"path": "pages/personalCenter/myTeam",
"style": {
......@@ -336,13 +336,14 @@
"enablePullDownRefresh": false
}
}, {
"path": "pages/learningStatistics/learningStatistics",
"style": {
"navigationBarTitleText": "学习统计",
"enablePullDownRefresh": false
}
},
},
// {
// "path": "pages/learningStatistics/learningStatistics",
// "style": {
// "navigationBarTitleText": "学习统计",
// "enablePullDownRefresh": false
// }
// },
{
"path": "pages/personalCenter/system/accontsetting",
"style": {
......
......@@ -38,6 +38,7 @@
</view>
</view>
<!-- 支付方式 -->
<view class="paymentMethodContent">
<h4>选择支付方式</h4>
<view @click="selectPaymentMethod(2)">
......@@ -61,17 +62,7 @@
<i class="iconfont icon-duihao txtFont"></i>
</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>
......
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