first commit
This commit is contained in:
ylj20011123
parent
5af8d7e996
commit
a1fa315551
@ -697,7 +697,6 @@ export default {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const result = await this.parseAddress(this.addressRecognition.inputText);
|
const result = await this.parseAddress(this.addressRecognition.inputText);
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
// 设置省市区
|
// 设置省市区
|
||||||
if (result.province && result.city && result.district) {
|
if (result.province && result.city && result.district) {
|
||||||
@ -719,17 +718,16 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: result.message || '地址识别失败，请检查地址格式',
|
title: result.message || '地址识别失败，请检查地址格式',
|
||||||
icon: 'none'
|
icon: 'none',
|
||||||
|
duration: 3000
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('地址识别错误:', error);
|
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '识别失败，请重试',
|
title: '识别失败，请重试',
|
||||||
icon: 'none'
|
icon: 'none',
|
||||||
|
duration: 3000
|
||||||
});
|
});
|
||||||
} finally {
|
|
||||||
uni.hideLoading();
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -798,7 +796,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
resolve({
|
resolve({
|
||||||
success: false,
|
success: false,
|
||||||
message: `无法识别完整的省市区信息，请检查地址格式。当前识别到：省份=${province}, 城市=${city}, 区县=${district}`
|
message: ``
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@ -2034,7 +2034,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.itemName {
|
.itemName {
|
||||||
width: 96rpx;
|
// width: 96rpx;
|
||||||
font-family: PingFangSC, PingFang SC;
|
font-family: PingFangSC, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
@ -2042,9 +2042,10 @@ export default {
|
|||||||
line-height: 32rpx;
|
line-height: 32rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
// overflow: hidden;
|
||||||
|
// text-overflow: ellipsis;
|
||||||
|
// white-space: nowrap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -161,8 +161,8 @@
|
|||||||
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce.png' : '/static/images/home/newReduce.png'" />
|
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce.png' : '/static/images/home/newReduce.png'" />
|
||||||
</div>
|
</div>
|
||||||
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
|
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
|
||||||
<div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
|
<div v-if="item.COMMODITY_STOCK > 0 && activeTabs !== 999999" class="addShopCar"
|
||||||
:id="'add_' +
|
@click.stop="touchOnGoods($event, item)" :id="'add_' +
|
||||||
item.SELLERCOMMODITY_ID +
|
item.SELLERCOMMODITY_ID +
|
||||||
'_' +
|
'_' +
|
||||||
item.SELLERCOMMODITYTYPE_ID
|
item.SELLERCOMMODITYTYPE_ID
|
||||||
@ -170,7 +170,8 @@
|
|||||||
<img class="optionBtn"
|
<img class="optionBtn"
|
||||||
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon.png' : '/static/images/home/newAddIcon.png'" />
|
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon.png' : '/static/images/home/newAddIcon.png'" />
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="shopState">已售罄</div>
|
<div v-if="activeTabs === 999999"></div>
|
||||||
|
<div v-if="item.COMMODITY_STOCK === 0 || !item.COMMODITY_STOCK" class="shopState">已售罄</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -75,13 +75,13 @@
|
|||||||
}}</view>
|
}}</view>
|
||||||
<view class="CouponItemLabel">积分</view>
|
<view class="CouponItemLabel">积分</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="line"></view>
|
<!-- <view class="line"></view>
|
||||||
<view class="CouponItem" @click="hanldGoBalance">
|
<view class="CouponItem" @click="hanldGoBalance">
|
||||||
<view class="CouponItemValue">{{
|
<view class="CouponItemValue">{{
|
||||||
$utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)
|
$utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)
|
||||||
}}</view>
|
}}</view>
|
||||||
<view class="CouponItemLabel">余额</view>
|
<view class="CouponItemLabel">余额</view>
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -1465,7 +1465,8 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.CouponItem {
|
.CouponItem {
|
||||||
width: calc((100% - 2px) / 3);
|
// width: calc((100% - 2px) / 3);
|
||||||
|
width: calc((100% - 2px) / 2);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@ -72,13 +72,13 @@
|
|||||||
}}</view>
|
}}</view>
|
||||||
<view class="CouponItemLabel">积分</view>
|
<view class="CouponItemLabel">积分</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="line"></view>
|
<!-- <view class="line"></view>
|
||||||
<view class="CouponItem" @click="hanldGoBalance">
|
<view class="CouponItem" @click="hanldGoBalance">
|
||||||
<view class="CouponItemValue">{{
|
<view class="CouponItemValue">{{
|
||||||
$utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)
|
$utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)
|
||||||
}}</view>
|
}}</view>
|
||||||
<view class="CouponItemLabel">余额</view>
|
<view class="CouponItemLabel">余额</view>
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -1475,7 +1475,8 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.CouponItem {
|
.CouponItem {
|
||||||
width: calc((100% - 2px) / 3);
|
// width: calc((100% - 2px) / 3);
|
||||||
|
width: calc((100% - 2px) / 2);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -810,29 +810,26 @@ var _default = {
|
|||||||
case 16:
|
case 16:
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: result.message || '地址识别失败，请检查地址格式',
|
title: result.message || '地址识别失败，请检查地址格式',
|
||||||
icon: 'none'
|
icon: 'none',
|
||||||
|
duration: 3000
|
||||||
});
|
});
|
||||||
case 17:
|
case 17:
|
||||||
_context5.next = 23;
|
_context5.next = 22;
|
||||||
break;
|
break;
|
||||||
case 19:
|
case 19:
|
||||||
_context5.prev = 19;
|
_context5.prev = 19;
|
||||||
_context5.t0 = _context5["catch"](3);
|
_context5.t0 = _context5["catch"](3);
|
||||||
console.error('地址识别错误:', _context5.t0);
|
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '识别失败，请重试',
|
title: '识别失败，请重试',
|
||||||
icon: 'none'
|
icon: 'none',
|
||||||
|
duration: 3000
|
||||||
});
|
});
|
||||||
case 23:
|
case 22:
|
||||||
_context5.prev = 23;
|
|
||||||
uni.hideLoading();
|
|
||||||
return _context5.finish(23);
|
|
||||||
case 26:
|
|
||||||
case "end":
|
case "end":
|
||||||
return _context5.stop();
|
return _context5.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, _callee5, null, [[3, 19, 23, 26]]);
|
}, _callee5, null, [[3, 19]]);
|
||||||
}))();
|
}))();
|
||||||
},
|
},
|
||||||
parseAddress: function parseAddress(addressText) {
|
parseAddress: function parseAddress(addressText) {
|
||||||
@ -906,7 +903,7 @@ var _default = {
|
|||||||
} else {
|
} else {
|
||||||
resolve({
|
resolve({
|
||||||
success: false,
|
success: false,
|
||||||
message: "\u65E0\u6CD5\u8BC6\u522B\u5B8C\u6574\u7684\u7701\u5E02\u533A\u4FE1\u606F\uFF0C\u8BF7\u68C0\u67E5\u5730\u5740\u683C\u5F0F\u3002\u5F53\u524D\u8BC6\u522B\u5230\uFF1A\u7701\u4EFD=".concat(province, ", \u57CE\u5E02=").concat(city, ", \u533A\u53BF=").concat(district)
|
message: ""
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@ -233,7 +233,6 @@
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
.main .header .typeBox .contentBox .rowBox .itemName.data-v-79c11018 {
|
.main .header .typeBox .contentBox .rowBox .itemName.data-v-79c11018 {
|
||||||
width: 96rpx;
|
|
||||||
font-family: PingFangSC, PingFang SC;
|
font-family: PingFangSC, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
@ -241,8 +240,6 @@
|
|||||||
line-height: 32rpx;
|
line-height: 32rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.main .header .typeBox .contentBox2.data-v-79c11018 {
|
.main .header .typeBox .contentBox2.data-v-79c11018 {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -103,13 +103,11 @@ var render = function () {
|
|||||||
var _h = _vm.$createElement
|
var _h = _vm.$createElement
|
||||||
var _c = _vm._self._c || _h
|
var _c = _vm._self._c || _h
|
||||||
var g0 = _vm.$utils.handleFormatNumber(_vm.userInfo.MEMBERSHIP_POINT || 0)
|
var g0 = _vm.$utils.handleFormatNumber(_vm.userInfo.MEMBERSHIP_POINT || 0)
|
||||||
var g1 = _vm.$utils.handleFormatNumber(_vm.userInfo.ACCOUNT_BALANCE || 0)
|
|
||||||
_vm.$mp.data = Object.assign(
|
_vm.$mp.data = Object.assign(
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
$root: {
|
$root: {
|
||||||
g0: g0,
|
g0: g0,
|
||||||
g1: g1,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -181,7 +181,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.main .pageTop .userTopInfo .couponBox .CouponContent .CouponItem.data-v-137d5072 {
|
.main .pageTop .userTopInfo .couponBox .CouponContent .CouponItem.data-v-137d5072 {
|
||||||
width: calc((100% - 2px) / 3);
|
width: calc((100% - 2px) / 2);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compileType": "miniprogram",
|
"compileType": "miniprogram",
|
||||||
"libVersion": "3.8.11",
|
"libVersion": "3.9.2",
|
||||||
"appid": "wxee018fb96955552a",
|
"appid": "wxee018fb96955552a",
|
||||||
"projectname": "caiyunyi",
|
"projectname": "caiyunyi",
|
||||||
"condition": {
|
"condition": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user