maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:17698bf1b8293538b1971cceced3c4c2f649cb19
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:244b6dea601adbaf65d831c2875b3654191066fb
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "17698bf1b8293538b1971cceced3c4c2f649cb19" and "244b6dea601adbaf65d831c2875b3654191066fb" have entirely different histories.
17698bf1b8 ... 244b6dea60

4 changed files with 11 additions and 16 deletions
Show Stats Expand all files Collapse all files

8
packages/customerService/chattingRecords/index.vue
View File

@ -35,12 +35,10 @@ export default {
isLoading: false,
page_num: 1,
page_size: 10,
itemObj: {},
merchantId: ''
itemObj: {}
}
},
onLoad(options){
this.merchantId = JSON.parse(options.merchant_id)
onLoad(){
},
onShow(){
// 页面显示时重新加载聊天记录
@ -58,7 +56,7 @@ export default {
page_num: this.page_num,
page_size: this.page_size
}).then((res) => {
this.recordsList = res.msg_list.filter(item => item.client_id_one !== item.client_id_two && item.mch_id == this.merchantId)
this.recordsList = res.msg_list.filter(item => item.client_id_one !== item.client_id_two)
})
} catch (error) {
console.error('加载聊天记录失败', error)

2
packages/localLife/UserComment/index.vue
View File

@ -11,7 +11,7 @@
</view>
<view class="Msg_Tit_right">
<image v-for="(item, index) in 5" :key="index"
:src="index < info.satisfaction ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start1.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start2.png'"
:src="indez < info.satisfaction ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start1.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start2.png'"
mode="aspectFill"></image>
</view>
</view>

14
packages/storeManagement/index/index.vue
View File

@ -112,17 +112,15 @@ export default {
shopList: [],
selectedShop: {},
baseList: [
// {
// image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1568.png",
// name: "订单",
// url: "/packages/storeManagement/order/index",
// },
{
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1568.png",
name: "订单",
url: "/packages/storeManagement/order/index",
}, {
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/gp_cancelAfterVerification.png",
name: "到店核销",
url: "/packages/storeManagement/orderVerification/index",
},
{
}, {
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/kefu0.png",
name: "客服",
url: "/packages/customerService/chattingRecords/index",
@ -185,7 +183,7 @@ export default {
click(item) {
// 根据item中的url进行跳转
if (item.url) {
NavgateTo(item.url + '?merchant_id=' + this.selectedShop.id)
NavgateTo(item.url)
} else {
console.warn('未配置跳转URL');
// 可添加默认跳转或提示

3
packages/user/wallet/index.vue
View File

@ -29,10 +29,9 @@
<view v-if="records.length > 0">
<view class="record-item" v-for="(record, index) in records" :key="index">
<view class="record-info">
<view class="record-name" v-if="topVal == '积分'">{{ record.change_reason }} - {{
<view class="record-name">{{ record.change_reason }} - {{
record.community_order_pay ? record.community_order_pay.order_pay_no :
record.quick_payment_record.order_no }}</view>
<view class="record-name" v-else>{{ record.change_reason }} - {{ record.related_order }}</view>
<view class="record-time">{{ record.create_time }}</view>
</view>
<view class="record-amount">