Compare commits

..

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

4 changed files with 11 additions and 16 deletions

View File

@ -35,12 +35,10 @@ export default {
isLoading: false, isLoading: false,
page_num: 1, page_num: 1,
page_size: 10, page_size: 10,
itemObj: {}, itemObj: {}
merchantId: ''
} }
}, },
onLoad(options){ onLoad(){
this.merchantId = JSON.parse(options.merchant_id)
}, },
onShow(){ onShow(){
// //
@ -58,7 +56,7 @@ export default {
page_num: this.page_num, page_num: this.page_num,
page_size: this.page_size page_size: this.page_size
}).then((res) => { }).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) { } catch (error) {
console.error('加载聊天记录失败', error) console.error('加载聊天记录失败', error)

View File

@ -11,7 +11,7 @@
</view> </view>
<view class="Msg_Tit_right"> <view class="Msg_Tit_right">
<image v-for="(item, index) in 5" :key="index" <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> mode="aspectFill"></image>
</view> </view>
</view> </view>

View File

@ -112,17 +112,15 @@ export default {
shopList: [], shopList: [],
selectedShop: {}, selectedShop: {},
baseList: [ 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", image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/gp_cancelAfterVerification.png",
name: "到店核销", name: "到店核销",
url: "/packages/storeManagement/orderVerification/index", url: "/packages/storeManagement/orderVerification/index",
}, }, {
{
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/kefu0.png", image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/kefu0.png",
name: "客服", name: "客服",
url: "/packages/customerService/chattingRecords/index", url: "/packages/customerService/chattingRecords/index",
@ -185,7 +183,7 @@ export default {
click(item) { click(item) {
// itemurl // itemurl
if (item.url) { if (item.url) {
NavgateTo(item.url + '?merchant_id=' + this.selectedShop.id) NavgateTo(item.url)
} else { } else {
console.warn('未配置跳转URL'); console.warn('未配置跳转URL');
// //

View File

@ -29,10 +29,9 @@
<view v-if="records.length > 0"> <view v-if="records.length > 0">
<view class="record-item" v-for="(record, index) in records" :key="index"> <view class="record-item" v-for="(record, index) in records" :key="index">
<view class="record-info"> <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.community_order_pay ? record.community_order_pay.order_pay_no :
record.quick_payment_record.order_no }}</view> 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 class="record-time">{{ record.create_time }}</view>
</view> </view>
<view class="record-amount"> <view class="record-amount">