xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reactor：清理部分 TODO

Browse Source
This commit is contained in:
YunaiV
2025-04-28 09:50:50 +08:00
parent 93ce26f6be
commit 08e7b32fc3
25 changed files with 95 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/order/addressSelection.vue
+1 -1
View File
@@ -68,7 +68,7 @@
</view>
</view>
<view class="line">
<image :src="sheep.$url.static('/static/images/line.png', 'local')" />
<image :src="sheep.$url.static('/static/img/shop/line.png')" />
</view>
</view>
</template>
pages/order/aftersale/apply.vue
-1
View File
@@ -64,7 +64,6 @@
v-model="formData.applyDescription"
placeholder="客官~请描述您遇到的问题，建议上传照片"
/>
<!-- TODO 芋艿：上传的测试 -->
<view class="upload-img">
<s-uploader
v-model:url="formData.applyPicUrls"
pages/order/confirm.vue
+1 -1
View File
@@ -194,7 +194,7 @@
@close="state.showCoupon = false"
/>
<!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
<!-- 满额折扣弹框 -->
<s-discount-list
v-model="state.orderInfo"
:show="state.showDiscount"
pages/order/detail.vue
+3 -3
View File
@@ -331,7 +331,7 @@
// 确认收货
async function onConfirm(orderId, ignore = false) {
// 需开启确认收货组件
// todo: 芋艿：待接入微信
// todo: 芋艿：待接入微信 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
let isOpenBusinessView = true;
@@ -432,7 +432,7 @@
onShow(async () => {
//onShow中获取订单列表,保证跳转后页面为最新状态
await getOrderDetail(state.orderInfo.id);
})
});
onLoad(async (options) => {
let id = 0;
@@ -444,7 +444,7 @@
if (state.comeinType === 'wechat') {
state.merchantTradeNo = options.merchant_trade_no;
}
state.orderInfo.id = id
state.orderInfo.id = id;
});
</script>
pages/order/list.vue
+1 -1
View File
@@ -209,7 +209,7 @@
// 确认收货 TODO 芋艿：待测试
async function onConfirm(order, ignore = false) {
// 需开启确认收货组件
// todo: 芋艿：需要后续接入微信收货组件
// todo: 芋艿：需要后续接入微信收货组件 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
let isOpenBusinessView = true;
pages/order/pickUpVerify.vue
+32 -31
View File
@@ -1,5 +1,5 @@
<template>
<view class='order-details'>
<view class="order-details">
<!-- 自提商品核销 -->
<view v-if="orderInfo.deliveryType === 2 && orderInfo.payStatus" class="writeOff borRadius14">
<view class="title">核销信息</view>
@@ -8,21 +8,19 @@
<image
v-if="!!painterImageUrl"
:src="painterImageUrl"
:style="{width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px`}"
:style="{ width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px` }"
:show-menu-by-longpress="true"
/>
</view>
</view>
<view class="gear">
<image :src="sheep.$url.static('/static/images/writeOff.png', 'local')"></image>
<image :src="sheep.$url.static('/static/img/shop/writeOff.png')"></image>
</view>
<view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
<view class="rules">
<!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
<view class="item">
<view class="rulesTitle flex flex-wrap align-center">
核销时间
</view>
<view class="rulesTitle flex flex-wrap align-center"> 核销时间 </view>
<view class="info">
每日：
<text class="time">2020-2-+52</text>
@@ -37,7 +35,10 @@
</view>
</view>
</view>
<view v-if="orderInfo.deliveryType === 2" class="map flex flex-wrap align-center ss-row-between borRadius14">
<view
v-if="orderInfo.deliveryType === 2"
class="map flex flex-wrap align-center ss-row-between borRadius14"
>
<view>自提地址信息</view>
<view class="place cart-color flex flex-wrap flex-center" @tap="showMaoLocation">
查看位置
@@ -64,14 +65,14 @@
type: Object,
default() {},
},
systemStore:{
systemStore: {
type: Object,
default() {},
}
},
});
const state = reactive({
qrcodeSize: 145
})
qrcodeSize: 145,
});
/**
* 打开地图
@@ -80,7 +81,7 @@
console.log(props.systemStore);
if (!props.systemStore.latitude || !props.systemStore.longitude) {
sheep.$helper.toast('缺少经纬度信息无法查看地图!');
return
return;
}
uni.openLocation({
latitude: props.systemStore.latitude,
@@ -89,19 +90,19 @@
name: props.systemStore.name,
address: props.systemStore.areaName + props.systemStore.detailAddress,
});
}
};
/**
* 拨打电话
*/
const makePhone = () => {
uni.makePhoneCall({
phoneNumber: props.systemStore.phone
})
}
phoneNumber: props.systemStore.phone,
});
};
const painterRef = ref(); // 海报画板
const painterImageUrl = ref(); // 海报 url
const showPainter = ref(true)
const showPainter = ref(true);
// 渲染海报
const renderPoster = async (poster) => {
await painterRef.value.render(poster);
@@ -109,7 +110,7 @@
// 获得生成的图片
const setPainterImageUrl = (path) => {
painterImageUrl.value = path;
showPainter.value = false
showPainter.value = false;
};
/**
* 生成核销二维码
@@ -118,23 +119,23 @@
renderPoster({
css: {
width: `${state.qrcodeSize}px`,
height: `${state.qrcodeSize}px`
height: `${state.qrcodeSize}px`,
},
views:[
views: [
{
type: 'qrcode',
text: text,
css: {
width: `${state.qrcodeSize}px`,
height: `${state.qrcodeSize}px`
}
}
]
})
}
height: `${state.qrcodeSize}px`,
},
},
],
});
};
defineExpose({
markCode
})
markCode,
});
</script>
<style scoped lang="scss">
@@ -142,10 +143,10 @@
border-radius: 14rpx !important;
}
.cart-color {
color: #E93323 !important;
border: 1px solid #E93323 !important
color: #e93323 !important;
border: 1px solid #e93323 !important;
}
.order-details{
.order-details {
border-radius: 10rpx;
margin: 0 20rpx 20rpx 20rpx;
}