Compare commits
No commits in common. "9e8d512bf05a11232fa03f09626522c2f35f0ac1" and "34d43fabd2eb99eebaf2476003cf98da9d4e38c5" have entirely different histories.
9e8d512bf0
...
34d43fabd2
@ -463,8 +463,7 @@ export default {
|
|||||||
currentAddress.location.lat + "," + currentAddress.location.lng;
|
currentAddress.location.lat + "," + currentAddress.location.lng;
|
||||||
}
|
}
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
console.log("fail", res);
|
console.log("fail", res);
|
||||||
@ -494,8 +493,7 @@ export default {
|
|||||||
location = res.latitude + "," + res.longitude;
|
location = res.latitude + "," + res.longitude;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
@ -618,8 +616,7 @@ export default {
|
|||||||
output: "json",
|
output: "json",
|
||||||
city_limit: true,
|
city_limit: true,
|
||||||
ret_coordtype: "gcj02ll",
|
ret_coordtype: "gcj02ll",
|
||||||
// ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
||||||
ak: that.bdMapAk,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let city = that.originalData.result.addressComponent.city;
|
let city = that.originalData.result.addressComponent.city;
|
||||||
|
|||||||
@ -1,12 +1,29 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="loginPopup-container">
|
<view class="loginPopup-container">
|
||||||
<uni-popup ref="popup" type="bottom" :mask-click="false" :safe-area="true" :borderRadius="'10px 10x 10px 10px'">
|
<uni-popup
|
||||||
|
ref="popup"
|
||||||
|
type="bottom"
|
||||||
|
:mask-click="false"
|
||||||
|
:safe-area="true"
|
||||||
|
:borderRadius="'10px 10x 10px 10px'"
|
||||||
|
>
|
||||||
<view class="popup-box">
|
<view class="popup-box">
|
||||||
<view class="head-img"></view>
|
<view class="head-img"></view>
|
||||||
<view v-if="showCloseIcon" class="uni-icon uni-icon-closeempty" color="#888" @click="close"></view>
|
<view
|
||||||
|
v-if="showCloseIcon"
|
||||||
|
class="uni-icon uni-icon-closeempty"
|
||||||
|
color="#888"
|
||||||
|
@click="close"
|
||||||
|
></view>
|
||||||
<view class="popup-content">
|
<view class="popup-content">
|
||||||
|
|
||||||
<!-- <view class="title"> 微信账号登录小发同城小程序 </view> -->
|
<!-- <view class="title"> 微信账号登录小发同城小程序 </view> -->
|
||||||
<button class="btn-login" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
<button
|
||||||
|
class="btn-login"
|
||||||
|
open-type="getPhoneNumber"
|
||||||
|
@getphonenumber="getPhoneNumber"
|
||||||
|
>
|
||||||
|
|
||||||
<view>手机号快捷登录</view>
|
<view>手机号快捷登录</view>
|
||||||
</button>
|
</button>
|
||||||
</view>
|
</view>
|
||||||
@ -23,18 +40,13 @@ export default {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
showCloseIcon: {
|
showCloseIcon:{
|
||||||
type: Boolean,
|
type:Boolean,
|
||||||
default: true,
|
default:true
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {};
|
||||||
tmplIds: [
|
|
||||||
"kiDj_hSF_ASwD-Dlgxnypi6IJBQZ12a-hEpd3zZ-Uxc",
|
|
||||||
// "Lq6_OHOemtmBoWGrd9zvyJ3ultzXB5metmqPtYeV0pc",
|
|
||||||
],
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(["showLoginPopup", "Config"]),
|
...mapState(["showLoginPopup", "Config"]),
|
||||||
@ -51,7 +63,7 @@ export default {
|
|||||||
// immediate: true,
|
// immediate: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
onUnload() { },
|
onUnload() {},
|
||||||
onHide() {
|
onHide() {
|
||||||
this.close();
|
this.close();
|
||||||
},
|
},
|
||||||
@ -84,8 +96,8 @@ export default {
|
|||||||
that.$.request({
|
that.$.request({
|
||||||
url: that.cf.URL.get_miniapp_open_id,
|
url: that.cf.URL.get_miniapp_open_id,
|
||||||
data: params,
|
data: params,
|
||||||
success: (data, status, msg, code) => { },
|
success: (data, status, msg, code) => {},
|
||||||
fail: (err, status) => { },
|
fail: (err, status) => {},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
that.$.showModal({
|
that.$.showModal({
|
||||||
@ -142,63 +154,6 @@ export default {
|
|||||||
},
|
},
|
||||||
success: function (res) {
|
success: function (res) {
|
||||||
that.doWxUserRegisterAndLogin(res.phoneNumber);
|
that.doWxUserRegisterAndLogin(res.phoneNumber);
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
that.$.showModal({
|
|
||||||
title: "订阅提示",
|
|
||||||
content: "是否订阅活动消息通知?",
|
|
||||||
cancelText: "暂不订阅",
|
|
||||||
confirmText: "立即订阅",
|
|
||||||
success: async function (n) {
|
|
||||||
if (n.confirm) {
|
|
||||||
wx.requestSubscribeMessage({
|
|
||||||
tmplIds: that.tmplIds,
|
|
||||||
success(rsp) {
|
|
||||||
let acceptCount = 0;
|
|
||||||
let rejectCount = 0;
|
|
||||||
|
|
||||||
console.log("success res====", rsp);
|
|
||||||
|
|
||||||
for (const templateId in rsp) {
|
|
||||||
if (that.tmplIds.includes(templateId)) {
|
|
||||||
const result = rsp[templateId];
|
|
||||||
if (result === "accept") {
|
|
||||||
acceptCount++;
|
|
||||||
} else if (
|
|
||||||
result === "reject" ||
|
|
||||||
result === "ban"
|
|
||||||
) {
|
|
||||||
rejectCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (acceptCount > 0 && rejectCount === 0) {
|
|
||||||
uni.showToast({
|
|
||||||
title: "订阅成功",
|
|
||||||
});
|
|
||||||
} else if (acceptCount === 0 && rejectCount > 0) {
|
|
||||||
uni.showToast({
|
|
||||||
title: "已拒绝订阅",
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
uni.showToast({
|
|
||||||
title: "已订阅或拒绝",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
fail(res) {
|
|
||||||
that.$.showModal({
|
|
||||||
content: `${res.errCode}:${res.errMsg}`,
|
|
||||||
showCancel: false,
|
|
||||||
confirmText: "好的",
|
|
||||||
})
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}, 500);
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -325,4 +280,4 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@ -299,7 +299,7 @@
|
|||||||
</swiper>
|
</swiper>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view v-if="item.eltmType == 8" class="mTel" :style="{ 'background-color': item.bgColor, top: mobileY + 'px' }"
|
<view v-if="item.eltmType == 8" class="mTel" :style="{ 'background-color': item.bgColor, top: initY + 'px' }"
|
||||||
:data-tel="item.eltm8.tel" @tap="callTel">
|
:data-tel="item.eltm8.tel" @tap="callTel">
|
||||||
<label class="iconfont icon-dianhua--copy"
|
<label class="iconfont icon-dianhua--copy"
|
||||||
:style="{ 'font-size': '30px', color: item.eltm8.fontColor }"></label>
|
:style="{ 'font-size': '30px', color: item.eltm8.fontColor }"></label>
|
||||||
@ -339,10 +339,10 @@
|
|||||||
:y="initY + 44 + 10">
|
:y="initY + 44 + 10">
|
||||||
<view class="mCS" :style="{
|
<view class="mCS" :style="{
|
||||||
'background-color': item.bgColor,
|
'background-color': item.bgColor,
|
||||||
borderTopLeftRadius: (item.borderTopLeftRadius) + 'px',
|
borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
|
||||||
borderTopRightRadius: (item.borderTopRightRadius) + 'px',
|
borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
|
||||||
borderBottomLeftRadius: (item.borderBottomLeftRadius) + 'px',
|
borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
|
||||||
borderBottomRightRadius: (item.borderBottomRightRadius) + 'px',
|
borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
}">
|
}">
|
||||||
<!-- #ifdef MP-WEIXIN&&false -->
|
<!-- #ifdef MP-WEIXIN&&false -->
|
||||||
@ -994,8 +994,7 @@ export default {
|
|||||||
showLoginPopup: false,
|
showLoginPopup: false,
|
||||||
chatUrl: "",
|
chatUrl: "",
|
||||||
initX: "690",
|
initX: "690",
|
||||||
initY: "667",
|
initY: "1336",
|
||||||
mobileY: "375",
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@ -1013,7 +1012,6 @@ export default {
|
|||||||
initX: data.width - 50,
|
initX: data.width - 50,
|
||||||
initY: data.height / 2,
|
initY: data.height / 2,
|
||||||
});
|
});
|
||||||
that.mobileY = data.height / 2;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -1149,9 +1147,8 @@ export default {
|
|||||||
console.log('=====',parseInt(t.type))
|
console.log('=====',parseInt(t.type))
|
||||||
switch (parseInt(t.type)) {
|
switch (parseInt(t.type)) {
|
||||||
case 0:
|
case 0:
|
||||||
//if (typeof t.mobile != "undefined" || t.mobile != "") {
|
if (typeof t.mobile != "undefined" || t.mobile != "") {
|
||||||
if (t?.mobile) {
|
console.log('==进来了===')
|
||||||
console.log('==进来了===', t.mobile)
|
|
||||||
uni.makePhoneCall({
|
uni.makePhoneCall({
|
||||||
phoneNumber:
|
phoneNumber:
|
||||||
typeof t.mobile != "undefined" ? t.mobile.toString() : "", //电话号码
|
typeof t.mobile != "undefined" ? t.mobile.toString() : "", //电话号码
|
||||||
@ -1544,7 +1541,6 @@ uni-page-body {
|
|||||||
|
|
||||||
.mCS {
|
.mCS {
|
||||||
position: initial;
|
position: initial;
|
||||||
border-radius: 100% !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.diyPage {
|
.diyPage {
|
||||||
@ -1570,17 +1566,4 @@ uni-page-body {
|
|||||||
.disable {
|
.disable {
|
||||||
filter: grayscale(1);
|
filter: grayscale(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.boxGrid{
|
|
||||||
padding-left: 10rpx !important;
|
|
||||||
padding-right: 10rpx !important;
|
|
||||||
}
|
|
||||||
.boxGridIcon{
|
|
||||||
width: 122rpx;
|
|
||||||
height: 122rpx;
|
|
||||||
image{
|
|
||||||
border-radius: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -53,11 +53,11 @@ export default {
|
|||||||
|
|
||||||
if ('chatimg' == this.node.attr.class)
|
if ('chatimg' == this.node.attr.class)
|
||||||
{
|
{
|
||||||
this.newStyleStr = `${styleStr}; max-width: 100%; padding: 0 ${+padding}px;`;
|
this.newStyleStr = `${styleStr}; width: 100%; padding: 0 ${+padding}px;`;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.newStyleStr = `${styleStr}; ${imageHeightStyle}; max-width: ${imageWidth}px; padding: 0 ${+padding}px;`;
|
this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 计算视觉优先的图片宽高
|
// 计算视觉优先的图片宽高
|
||||||
|
|||||||
@ -324,7 +324,7 @@ class apiconfig {
|
|||||||
.replace(/img\[([^\s]+?)\]/g, function(img){ //转义图片
|
.replace(/img\[([^\s]+?)\]/g, function(img){ //转义图片
|
||||||
//return '<img class="layui-layim-photos" style="width: 100%;height: 100%;" src="' + img.replace(/(^img\[)|(\]$)/g, '') + '">';
|
//return '<img class="layui-layim-photos" style="width: 100%;height: 100%;" src="' + img.replace(/(^img\[)|(\]$)/g, '') + '">';
|
||||||
|
|
||||||
return '<div><img class="chatimg single-img" style="max-width:100%" src="' + img.replace(/(^img\[)|(\]$)/g, '') + '" /><span style="min-width: 240px;"> </span></div>';
|
return '<div><img class="chatimg single-img" src="' + img.replace(/(^img\[)|(\]$)/g, '') + '" /><span style="min-width: 240px;"> </span></div>';
|
||||||
})
|
})
|
||||||
.replace(/file\([\s\S]+?\)\[[\s\S]*?\]/g, function(str){ //转义文件
|
.replace(/file\([\s\S]+?\)\[[\s\S]*?\]/g, function(str){ //转义文件
|
||||||
var href = (str.match(/file\(([\s\S]+?)\)\[/)||[])[1];
|
var href = (str.match(/file\(([\s\S]+?)\)\[/)||[])[1];
|
||||||
|
|||||||
@ -855,7 +855,7 @@ export default {
|
|||||||
data.item_row.item_id;
|
data.item_row.item_id;
|
||||||
|
|
||||||
let imgstr =
|
let imgstr =
|
||||||
'<img class="chatimg aaa1" style="max-width:100%" src="' +
|
'<img class="chatimg" src="' +
|
||||||
data.item_row.product_image +
|
data.item_row.product_image +
|
||||||
'">';
|
'">';
|
||||||
let content =
|
let content =
|
||||||
@ -886,7 +886,7 @@ export default {
|
|||||||
//读取订单信息,直接发送出去
|
//读取订单信息,直接发送出去
|
||||||
if (options.text) {
|
if (options.text) {
|
||||||
let msg = {
|
let msg = {
|
||||||
text: options.text+'aaa1',
|
text: options.text,
|
||||||
};
|
};
|
||||||
that.sendMsg(msg, "text");
|
that.sendMsg(msg, "text");
|
||||||
}
|
}
|
||||||
@ -1226,7 +1226,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.info(data);
|
console.info(data);
|
||||||
console.info("msgList1111", this.msgList);
|
console.info("msgList", this.msgList);
|
||||||
|
|
||||||
if (callback) {
|
if (callback) {
|
||||||
callback();
|
callback();
|
||||||
|
|||||||
@ -851,7 +851,7 @@ export default {
|
|||||||
data.item_row.item_id */
|
data.item_row.item_id */
|
||||||
|
|
||||||
let imgstr =
|
let imgstr =
|
||||||
'<img class="chatimg" style="max-width:100%" src="' +
|
'<img class="chatimg" src="' +
|
||||||
data.info.product_image +
|
data.info.product_image +
|
||||||
'">';
|
'">';
|
||||||
let content =
|
let content =
|
||||||
|
|||||||
5
main.js
5
main.js
@ -38,11 +38,6 @@ Vue.prototype.sprintf = $.sprintf
|
|||||||
Vue.prototype.number_format = $.number_format
|
Vue.prototype.number_format = $.number_format
|
||||||
Vue.prototype.mf = $.mf
|
Vue.prototype.mf = $.mf
|
||||||
Vue.prototype.statecode = Statecode
|
Vue.prototype.statecode = Statecode
|
||||||
Vue.prototype.bdMapAk = "j2XbIbapUzLD0ycnJa6Cc5T7lppsxvMJ";
|
|
||||||
Vue.prototype.tmplIds = [
|
|
||||||
"kiDj_hSF_ASwD-Dlgxnypi6IJBQZ12a-hEpd3zZ-Uxc",
|
|
||||||
"Lq6_OHOemtmBoWGrd9zvyJ3ultzXB5metmqPtYeV0pc",
|
|
||||||
];
|
|
||||||
//Vue.prototype.$mysocket = mysocket;
|
//Vue.prototype.$mysocket = mysocket;
|
||||||
Vue.prototype.$Socket = Socket;
|
Vue.prototype.$Socket = Socket;
|
||||||
Vue.prototype.$apiconfig = apiconfig;
|
Vue.prototype.$apiconfig = apiconfig;
|
||||||
|
|||||||
@ -294,8 +294,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mp-baidu" : {
|
"mp-baidu" : {
|
||||||
// "appid" : "15306246",
|
"appid" : "15306246",
|
||||||
"appid" : "120197275",
|
|
||||||
"setting" : {
|
"setting" : {
|
||||||
"urlCheck" : true
|
"urlCheck" : true
|
||||||
},
|
},
|
||||||
|
|||||||
@ -409,8 +409,7 @@ export default {
|
|||||||
let that = this;
|
let that = this;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (type2 == "found") {
|
if (type2 == "found") {
|
||||||
@ -548,8 +547,7 @@ export default {
|
|||||||
let that = this;
|
let that = this;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
@ -1024,8 +1022,7 @@ export default {
|
|||||||
region: this.originalData.result.addressComponent.city,
|
region: this.originalData.result.addressComponent.city,
|
||||||
output: "json",
|
output: "json",
|
||||||
city_limit: true,
|
city_limit: true,
|
||||||
// ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
||||||
ak: that.bdMapAk,
|
|
||||||
ret_coordtype: "gcj02ll",
|
ret_coordtype: "gcj02ll",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -352,7 +352,6 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
getLocation() {
|
getLocation() {
|
||||||
const that = this
|
|
||||||
uni.getLocation({
|
uni.getLocation({
|
||||||
type: "wgs84",
|
type: "wgs84",
|
||||||
isHighAccuracy: true,
|
isHighAccuracy: true,
|
||||||
@ -360,8 +359,7 @@ export default {
|
|||||||
location = res.latitude + "," + res.longitude;
|
location = res.latitude + "," + res.longitude;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
@ -442,8 +440,7 @@ export default {
|
|||||||
location = res.latitude + "," + res.longitude;
|
location = res.latitude + "," + res.longitude;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
@ -607,8 +604,7 @@ export default {
|
|||||||
let baiduParams = {
|
let baiduParams = {
|
||||||
uid: uid,
|
uid: uid,
|
||||||
scope: 1,
|
scope: 1,
|
||||||
// ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
|
||||||
ak: this.bdMapAk,
|
|
||||||
output: "json",
|
output: "json",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -167,8 +167,7 @@
|
|||||||
:data-on="OrderInfo.order_id"
|
:data-on="OrderInfo.order_id"
|
||||||
v-if="
|
v-if="
|
||||||
OrderInfo.kind_id == 1201 &&
|
OrderInfo.kind_id == 1201 &&
|
||||||
[2040,2050,2060].includes(OrderInfo.order_state_id) &&
|
OrderInfo.order_state_id == StateCode.ORDER_STATE_SHIPPED
|
||||||
OrderInfo.order_is_received==0
|
|
||||||
"
|
"
|
||||||
@click="confirmReceipt(OrderInfo, $event)"
|
@click="confirmReceipt(OrderInfo, $event)"
|
||||||
>{{ __("确认收货") }}</view
|
>{{ __("确认收货") }}</view
|
||||||
@ -1201,10 +1200,7 @@ export default {
|
|||||||
time: null,
|
time: null,
|
||||||
isReminderOrder: false,
|
isReminderOrder: false,
|
||||||
subscribe: 0,
|
subscribe: 0,
|
||||||
// tmplIds: [
|
tmplIds: ["kiDj_hSF_ASwD-Dlgxnypi6IJBQZ12a-hEpd3zZ-Uxc", "Lq6_OHOemtmBoWGrd9zvyJ3ultzXB5metmqPtYeV0pc"],
|
||||||
// "kiDj_hSF_ASwD-Dlgxnypi6IJBQZ12a-hEpd3zZ-Uxc",
|
|
||||||
// "Lq6_OHOemtmBoWGrd9zvyJ3ultzXB5metmqPtYeV0pc",
|
|
||||||
// ],
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
@ -1257,39 +1253,35 @@ export default {
|
|||||||
this.notice.addNotification("RefreshMessage", this.RefreshMessage, this);
|
this.notice.addNotification("RefreshMessage", this.RefreshMessage, this);
|
||||||
},
|
},
|
||||||
onShow: function () {
|
onShow: function () {
|
||||||
const _this = this;
|
const _this = this
|
||||||
this.InitPage(this.options);
|
this.InitPage(this.options);
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
if (this.subscribe == 1) {
|
||||||
if (this.subscribe == 1) {
|
$.showModal({
|
||||||
$.showModal({
|
title: "订阅提示",
|
||||||
title: "订阅提示",
|
content: "是否订阅活动消息通知?",
|
||||||
content: "是否订阅活动消息通知?",
|
cancelText: "暂不订阅",
|
||||||
cancelText: "暂不订阅",
|
confirmText: "立即订阅",
|
||||||
confirmText: "立即订阅",
|
success: function (n) {
|
||||||
success: function (n) {
|
if (n.confirm) {
|
||||||
if (n.confirm) {
|
wx.requestSubscribeMessage({
|
||||||
wx.requestSubscribeMessage({
|
tmplIds: _this.tmplIds,
|
||||||
tmplIds: _this.tmplIds,
|
success(res) {
|
||||||
success(res) {
|
console.log("success res====", res);
|
||||||
console.log("success res====", res);
|
uni.showToast({
|
||||||
// uni.showToast({
|
title: "消息已订阅",
|
||||||
// title: "消息已订阅",
|
});
|
||||||
// });
|
},
|
||||||
},
|
fail(res) {
|
||||||
fail(res) {
|
uni.showToast({
|
||||||
console.log("fail res====", res);
|
title: "稍后再试",
|
||||||
// uni.showToast({
|
});
|
||||||
// title: "稍后再试",
|
},
|
||||||
// });
|
});
|
||||||
},
|
}
|
||||||
});
|
},
|
||||||
}
|
});
|
||||||
},
|
}
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (error) {}
|
|
||||||
}, 500);
|
|
||||||
},
|
},
|
||||||
onUnload: function () {
|
onUnload: function () {
|
||||||
//移除通知
|
//移除通知
|
||||||
|
|||||||
@ -351,8 +351,7 @@
|
|||||||
:data-on="items.order_id"
|
:data-on="items.order_id"
|
||||||
v-if="
|
v-if="
|
||||||
items.kind_id == 1201 &&
|
items.kind_id == 1201 &&
|
||||||
[2040, 2050, 2060].includes(items.order_state_id) &&
|
items.order_state_id == StateCode.ORDER_STATE_SHIPPED
|
||||||
items.order_is_received == 0
|
|
||||||
"
|
"
|
||||||
class="u-link-btn"
|
class="u-link-btn"
|
||||||
@click="confirmReceipt(items, $event)"
|
@click="confirmReceipt(items, $event)"
|
||||||
|
|||||||
@ -1873,7 +1873,7 @@ export default {
|
|||||||
let that = this;
|
let that = this;
|
||||||
var n = {
|
var n = {
|
||||||
api: this.Config.URL.wx.get_tpl_msg_config,
|
api: this.Config.URL.wx.get_tpl_msg_config,
|
||||||
pages: "/member/order/detail?on="+e,
|
pages: "/member/order/detail?on=" + e,
|
||||||
formId: this.formId,
|
formId: this.formId,
|
||||||
WeiXinOpenId: this.userInfo.openId,
|
WeiXinOpenId: this.userInfo.openId,
|
||||||
value: {
|
value: {
|
||||||
@ -1943,7 +1943,7 @@ export default {
|
|||||||
},
|
},
|
||||||
onFail: function (e) {
|
onFail: function (e) {
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$.gotopage("/member/order/detail?on="+this.order_id);
|
that.$.gotopage("/member/order/detail?on=" + this.order_id);
|
||||||
},
|
},
|
||||||
returnUrl: function (e) {
|
returnUrl: function (e) {
|
||||||
var that = this;
|
var that = this;
|
||||||
@ -1955,7 +1955,7 @@ export default {
|
|||||||
// 延时100毫秒等待异步队列setPaidYes的处理
|
// 延时100毫秒等待异步队列setPaidYes的处理
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
that.$.gotopage(
|
that.$.gotopage(
|
||||||
`/member/order/detail?on=${e}&init_pay_flag=true&subscribe=1`
|
`/member/order/detail?on="${e}&init_pay_flag=true&subscribe=1`
|
||||||
);
|
);
|
||||||
}, 100);
|
}, 100);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -526,7 +526,6 @@ export default {
|
|||||||
borderColor: "#dfdfdf",
|
borderColor: "#dfdfdf",
|
||||||
fontColor: "#fff",
|
fontColor: "#fff",
|
||||||
backgroundColor: "transparent",
|
backgroundColor: "transparent",
|
||||||
|
|
||||||
provinceData: [],
|
provinceData: [],
|
||||||
cityData: [],
|
cityData: [],
|
||||||
areaData: [],
|
areaData: [],
|
||||||
@ -626,36 +625,6 @@ export default {
|
|||||||
);
|
);
|
||||||
that.notice.addNotification("RefreshSubsite", that.RefreshSubsite, that);
|
that.notice.addNotification("RefreshSubsite", that.RefreshSubsite, that);
|
||||||
that.notice.addNotification("ScanCode", that.onScanCode, that);
|
that.notice.addNotification("ScanCode", that.onScanCode, that);
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
$.showModal({
|
|
||||||
title: "订阅提示",
|
|
||||||
content: "是否订阅活动消息通知?",
|
|
||||||
cancelText: "暂不订阅",
|
|
||||||
confirmText: "立即订阅",
|
|
||||||
success: function (n) {
|
|
||||||
if (n.confirm) {
|
|
||||||
wx.requestSubscribeMessage({
|
|
||||||
tmplIds: that.tmplIds,
|
|
||||||
success(res) {
|
|
||||||
console.log("success res====", res);
|
|
||||||
// uni.showToast({
|
|
||||||
// title: "消息已订阅",
|
|
||||||
// });
|
|
||||||
},
|
|
||||||
fail(res) {
|
|
||||||
console.log("fail res====", res);
|
|
||||||
// uni.showToast({
|
|
||||||
// title: "稍后再试",
|
|
||||||
// });
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
} catch (error) {}
|
|
||||||
}, 1000);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -667,9 +636,9 @@ export default {
|
|||||||
* 生命周期函数--监听页面显示
|
* 生命周期函数--监听页面显示
|
||||||
*/
|
*/
|
||||||
onShow: function () {
|
onShow: function () {
|
||||||
let _this = this;
|
let that = this;
|
||||||
this.getAppDistrict();
|
this.getAppDistrict();
|
||||||
//_this.$.isNull(_this.plantformInfo) || uni.setNavigationBarTitle({title: _this.plantformInfo.name});
|
//that.$.isNull(that.plantformInfo) || uni.setNavigationBarTitle({title: that.plantformInfo.name});
|
||||||
//this.refresh || this.setData({refresh: true})
|
//this.refresh || this.setData({refresh: true})
|
||||||
|
|
||||||
this.showCartNum();
|
this.showCartNum();
|
||||||
@ -684,10 +653,10 @@ export default {
|
|||||||
if (currentAddress) {
|
if (currentAddress) {
|
||||||
this.address = currentAddress.name;
|
this.address = currentAddress.name;
|
||||||
} else {
|
} else {
|
||||||
_this.isPhoneLocationEnabled();
|
that.isPhoneLocationEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
_this.resetLang();
|
that.resetLang();
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -997,8 +966,7 @@ export default {
|
|||||||
location = res.latitude + "," + res.longitude;
|
location = res.latitude + "," + res.longitude;
|
||||||
|
|
||||||
let BMap = new bmap.BMapWX({
|
let BMap = new bmap.BMapWX({
|
||||||
// ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
|
||||||
ak: that.bdMapAk,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let fail = function (res) {
|
let fail = function (res) {
|
||||||
|
|||||||
@ -646,12 +646,10 @@ export default {
|
|||||||
.diy_goods_carts {
|
.diy_goods_carts {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: 24rpx;
|
right: 24rpx;
|
||||||
bottom: 400rpx;
|
bottom: 240rpx;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
|
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@ -663,8 +661,8 @@ export default {
|
|||||||
box-shadow: 2rpx 4rpx 20rpx rgba(0,0,0,0.3);
|
box-shadow: 2rpx 4rpx 20rpx rgba(0,0,0,0.3);
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
width: 64rpx;
|
width: 48rpx;
|
||||||
height: 64rpx;
|
height: 48rpx;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -390,7 +390,7 @@ export default {
|
|||||||
.diy_goods_carts {
|
.diy_goods_carts {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: 24rpx;
|
right: 24rpx;
|
||||||
bottom: 400rpx;
|
bottom: 240rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@ -404,8 +404,8 @@ export default {
|
|||||||
box-shadow: 2rpx 4rpx 20rpx rgba(0,0,0,0.3);
|
box-shadow: 2rpx 4rpx 20rpx rgba(0,0,0,0.3);
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
width: 64rpx;
|
width: 48rpx;
|
||||||
height: 64rpx;
|
height: 48rpx;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user