Commit ef43d451 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 9365b1d5
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
inviteUId: '', inviteUId: '',
serviceUrl: '', serviceUrl: '',
downUrl: '', // downUrl: '', //
versionName: 'v 1.0.0', versionName: '1.1.0',
auth: false, // 三要素实名认证 auth: false, // 三要素实名认证
userInfo: null, userInfo: null,
pkgName: 'com.mints.dybrightvideo' pkgName: 'com.mints.dybrightvideo'
......
...@@ -81,8 +81,9 @@ ...@@ -81,8 +81,9 @@
</view> </view>
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<button @click="handleKefu" open-type="im" data-im-id="dy1d1fub8mqd" style="font-size: 24rpx;color: gray;margin-top: 16rpx;margin-bottom: 18rpx;background-color: transparent;"> <view style="font-size: 29rpx;color: gray;margin-top: 16rpx;">
订单中如有疑问,请联系客服</button> 客服时间工作日 9:00-18:00</view>
<button class="button2" open-type="im" data-im-id="du_movie">在线客服</button>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -175,11 +176,11 @@ ...@@ -175,11 +176,11 @@
}, },
handleAgree() { handleAgree() {
this.agreeFlag = true this.agreeFlag = true
}, },
handleClickClose() { handleClickClose() {
this.$refs.coinPop.close('bottom'); this.$refs.coinPop.close('bottom');
this.$emit('clickClose'); this.$emit('clickClose');
this.$emit('close'); this.$emit('close');
}, },
handleClose() { handleClose() {
this.$refs.coinPop.close('bottom'); this.$refs.coinPop.close('bottom');
...@@ -190,12 +191,12 @@ ...@@ -190,12 +191,12 @@
this.handlePay(); this.handlePay();
}, },
handlePay() { handlePay() {
if (this.os == 'ios') { // if (this.os == 'ios') {
message.notify('iOS暂不支持购买'); // message.notify('iOS暂不支持购买');
return // return
} // }
let that = this; let that = this;
let vipBean = this.vipList[this.selectedIndex]; let vipBean = this.vipList[this.selectedIndex];
...@@ -242,33 +243,14 @@ ...@@ -242,33 +243,14 @@
} }
let that = this; let that = this;
if (this.os == 'ios') { tt.getOrderPayment({
if (!tt.canIUse('getOrderPayment.object.imId')) { orderId: oid,
message.notify('请升级抖音APP版本'); success(res) {
return that.queryOrderStatus(largeType, ttData.tidStr);
} },
fail(res) {
tt.getOrderPayment({ },
orderId: oid, });
imId: ttData.imId,
success(res) {
that.queryOrderStatus(largeType, ttData.tidStr);
},
fail(res) {
// message.notify(res.errMsg);
},
});
} else {
tt.getOrderPayment({
orderId: oid,
success(res) {
that.queryOrderStatus(largeType, ttData.tidStr);
},
fail(res) {
// message.notify(res.errMsg);
},
});
}
}, },
queryOrderStatus(largeType, tid) { queryOrderStatus(largeType, tid) {
let that = this; let that = this;
...@@ -391,4 +373,18 @@ ...@@ -391,4 +373,18 @@
} }
} }
} }
.button2 {
width: 300rpx;
height: 50rpx;
line-height: 50rpx;
text-align: center;
margin: 10rpx 20rpx;
border-radius: 10rpx;
background-color: white;
border: 1px orange solid;
color: orange;
font-size: 26rpx;
box-shadow: 0 0 2px 0px rgba(255, 255, 255, 0.1);
}
</style> </style>
\ No newline at end of file
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
<image @click="onClose" style="width: 50rpx; height: 50rpx;margin-left:auto;margin-right: 30rpx; <image @click="onClose" style="width: 50rpx; height: 50rpx;margin-left:auto;margin-right: 30rpx;
margin-bottom: 30rpx;" src="https://mints-web.oss-cn-beijing.aliyuncs.com/images/ic_close_white.png"></image> margin-bottom: 30rpx;" src="https://mints-web.oss-cn-beijing.aliyuncs.com/images/ic_close_white.png"></image>
<view class="content"> <view class="content">
<text style="font-size: 40rpx;margin-bottom: 15rpx;">客服时间: 工作日9:00-18:00</text>
<text class="button1" @click="handleBtn1">客服电话</text> <text class="button1" @click="handleBtn1">客服电话</text>
<button class="button2" open-type="im" data-im-id="dy1d1fub8mqd">客服在线</button> <button class="button2" open-type="im" data-im-id="du_movie">在线客服</button>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
...@@ -52,11 +53,11 @@ ...@@ -52,11 +53,11 @@
this.onClose() this.onClose()
}, },
imCallback(e) { imCallback(e) {
console.log("跳转IM客服成功", e.detail); console.log("跳转IM客服成功", e.detail);
this.onClose() this.onClose()
}, },
onimError(e) { onimError(e) {
console.log("拉起IM客服失败", e.detail); console.log("拉起IM客服失败", e.detail);
this.onClose() this.onClose()
} }
}, },
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
handler: function(newVal, oldVal) { handler: function(newVal, oldVal) {
if (newVal) { if (newVal) {
this.handleShow(); this.handleShow();
} }
}, },
immediate: true immediate: true
} }
......
...@@ -131,6 +131,7 @@ export default { ...@@ -131,6 +131,7 @@ export default {
Object.assign(header, { Object.assign(header, {
token: uni.getStorageSync('token'), token: uni.getStorageSync('token'),
pkgName: app.globalData.pkgName, pkgName: app.globalData.pkgName,
version: app.globalData.versionName,
proChannel:uniChannel proChannel:uniChannel
}) })
......
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