yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改客服电话文案

Browse Source 
2.修改首页定位问题
yj-dev
杨杰 2 years ago
parent a9adb4f5f4
commit 5792bde606
5 changed files with 122 additions and 85 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      pages/goods/externalCoupon/externalCoupon.vue
  2. 27
      pages/order/confirmation.vue
  3. 4
      pages/tabBar/category/category.vue
  4. 103
      pages/tabBar/home/home.vue
  5. 4
      pages/tabBar/user/user.vue

13
pages/goods/externalCoupon/externalCoupon.vue
Unescape View File

@ -17,10 +17,10 @@
<button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN" <button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN"
@click="jumpres">点击领取</button> @click="jumpres">点击领取</button>
<button class="coupne-btn width60w mart20 marb20" style="background-color: red;" <button class="coupne-btn width60w mart20 marb20" style="background-color: red;"
v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 2" v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1"
@click="receiveDiscount">点击领取</button> @click="receiveDiscount">点击领取</button>
<button class="coupne-btn width60w mart20 marb20" style="background-color: #f6f6f6;" <button class="coupne-btn width60w mart20 marb20" style="background-color: #f6f6f6;"
v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1" v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status != 1"
@click="receiveDiscount">点击领取</button> @click="receiveDiscount">点击领取</button>
<view class="width90 mart10 fcor666">去使用</view> <view class="width90 mart10 fcor666">去使用</view>
<view v-if="minecoupones == '' " class="mart60 fotct font14 fcor666"> <view v-if="minecoupones == '' " class="mart60 fotct font14 fcor666">
@ -261,9 +261,18 @@
//商品跳转 //商品跳转
toGoods(e) { toGoods(e) {
if (app.globalData.userInfo) { if (app.globalData.userInfo) {
if (app.globalData.openId) {
uni.navigateTo({ uni.navigateTo({
url: '../../order/confirmation?id=' + e url: '../../order/confirmation?id=' + e
}) })
} else {
uni.showToast({
icon: 'none',
title: '网络异常，请稍后重试',
duration: 2000
})
}
} else { } else {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

27
pages/order/confirmation.vue
Unescape View File

@ -103,6 +103,18 @@
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view> <view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
v-if="couponList.payType == 1 || couponList.payType==3 ">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
<radio :checked="paytype=='weixin'" color="#0083f5" />
</view>
</view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" <view class="height50 width100 backcorfff"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
@tap="paytype='jinbi'"> @tap="paytype='jinbi'">
@ -116,17 +128,6 @@
</view> </view>
<view class="width94 line1 mart5 marb5" <view class="width94 line1 mart5 marb5"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view> v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
v-if="couponList.payType == 1 || couponList.payType==3 ">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
<radio :checked="paytype=='weixin'" color="#0083f5" />
</view>
</view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4"> <view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;"> <view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text> 汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
@ -233,7 +234,7 @@
radioStatus: true, radioStatus: true,
memDiscountId: '', memDiscountId: '',
user: '', user: '',
paytype: '', paytype: 'weixin',
PaymentPassword: '', PaymentPassword: '',
orderId: '', orderId: '',
jumpType: '', jumpType: '',
@ -258,7 +259,7 @@
}, },
onShow() { onShow() {
let that = this; let that = this;
that.paytype = ''; // that.paytype = '';
that.user = app.globalData.userInfo; that.user = app.globalData.userInfo;
that.findUser(); that.findUser();
}, },

4
pages/tabBar/category/category.vue
Unescape View File

@ -280,9 +280,11 @@
}, },
//拨打客服电话 //拨打客服电话
playPhone() { playPhone() {
let cont = "本服务由惠兑礼品提供\n400-678-738";
let content = cont.replace(/<br>/g,"\n");
uni.showModal({ uni.showModal({
title: '客服', title: '客服',
content: '4006780738', content: content,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.makePhoneCall({ uni.makePhoneCall({

103
pages/tabBar/home/home.vue
Unescape View File

@ -253,53 +253,53 @@
}) })
}, },
}) })
// #endif
//定位 //定位
that.postionIng(); that.postionIng();
// #endif
// #ifdef H5 // #ifdef H5
// if (app.globalData.h5code) { // if (app.globalData.h5code) {
// that.getH5AccessToken(); // that.getH5AccessToken();
// } // }
uni.showLoading({ // uni.showLoading({
title: '加载中' // title: '加载中'
}) // })
var geolocation = new qq.maps.Geolocation('7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB', "嗨森逛"); // var geolocation = new qq.maps.Geolocation('7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB', "嗨森逛");
// 回调的第一次参数为成功后具体的位置信息 // 回调的第一次参数为成功后具体的位置信息
geolocation.getLocation( // geolocation.getLocation(
res => { // res => {
uni.hideLoading(); // uni.hideLoading();
app.globalData.latitude = res.lat; // app.globalData.latitude = res.lat;
app.globalData.longitude = res.lng; // app.globalData.longitude = res.lng;
uni.setStorage({ // uni.setStorage({
key: "latitude", // key: "latitude",
data: res.lat // data: res.lat
}) // })
uni.setStorage({ // uni.setStorage({
key: "longitude", // key: "longitude",
data: res.lng // data: res.lng
}) // })
that.findByLatAndLng(res.lng, res.lat); // that.findByLatAndLng(res.lng, res.lat);
}, // },
err => { // err => {
uni.hideLoading(); // uni.hideLoading();
uni.showModal({ // uni.showModal({
title: '获取定位权限失败,默认城市重庆市', // title: '获取定位权限失败,默认城市重庆市',
content: '请确定手机定位已打开，并且当前浏览器允许获取定位，都开启后请刷新页面。' // content: '请确定手机定位已打开，并且当前浏览器允许获取定位，都开启后请刷新页面。'
}) // })
that.city = '重庆市'; // that.city = '重庆市';
app.globalData.cityName = '重庆市'; // app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000'; // app.globalData.cityId = '500000';
that.getCouponListArea(); // that.getCouponListArea();
that.getCouponListgold(); // that.getCouponListgold();
that.getunioncardCouponListgold(); // that.getunioncardCouponListgold();
that.getCmsContent(); // that.getCmsContent();
that.getCmsAactibity(); // that.getCmsAactibity();
that.getCmsContentcmshome(); // that.getCmsContentcmshome();
that.getCmsContentcmsContent(); // that.getCmsContentcmsContent();
} // }
); // );
// #endif // #endif
uni.getStorage({ uni.getStorage({
key: "user", key: "user",
@ -456,10 +456,21 @@
success: function(res) { success: function(res) {
app.globalData.latitude = res.latitude; app.globalData.latitude = res.latitude;
app.globalData.longitude = res.longitude; app.globalData.longitude = res.longitude;
uni.setStorage({
key: "latitude",
data: res.latitude
})
uni.setStorage({
key: "longitude",
data: res.longitude
})
uni.hideLoading(); uni.hideLoading();
that.findByLatAndLng(res.longitude, res.latitude); that.findByLatAndLng(res.longitude, res.latitude);
}, },
fail: (err) => { fail: (err) => {
uni.hideLoading();
if (err.errCode == 2) { if (err.errCode == 2) {
uni.showToast({ uni.showToast({
title: '请开启系统定位', title: '请开启系统定位',
@ -467,6 +478,16 @@
icon: 'none' icon: 'none'
}) })
} }
that.city = '重庆市';
app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000';
that.getCouponListArea();
that.getCouponListgold();
that.getunioncardCouponListgold();
that.getCmsContent();
that.getCmsAactibity();
that.getCmsContentcmshome();
that.getCmsContentcmsContent();
} }
}) })
}, },
@ -914,9 +935,11 @@
}, },
//拨打客服电话 //拨打客服电话
playPhone() { playPhone() {
let cont = "本服务由惠兑礼品提供\n400-678-738";
let content = cont.replace(/<br>/g, "\n");
uni.showModal({ uni.showModal({
title: '客服', title: '客服',
content: '4006780738', content: content,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.makePhoneCall({ uni.makePhoneCall({

4
pages/tabBar/user/user.vue
Unescape View File

@ -489,10 +489,12 @@
}) })
} }
// #ifdef H5 // #ifdef H5
let cont = "本服务由惠兑礼品提供\n400-678-738";
let content = cont.replace(/<br>/g,"\n");
if (item == '客服') { if (item == '客服') {
uni.showModal({ uni.showModal({
title: '客服', title: '客服',
content: '4006780738', content: content,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.makePhoneCall({ uni.makePhoneCall({

Write Preview
Loading…
Cancel
Save