tangxinyue
/
alipay-emulator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

This commit is contained in:
小李 2026-06-12 16:51:25 +08:00
parent 4e16330877 dbc666a90d
commit e7705b1162
4 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.js
View File

@ -29,7 +29,7 @@ export function createApp() {
app.config.globalProperties.$system = plus.os.name; app.config.globalProperties.$system = plus.os.name;
// #endif // #endif
app.config.globalProperties.$systemInfo = systemInfo app.config.globalProperties.$systemInfo = systemInfo
uni.setStorageSync('version', '1.0.6.sp10') uni.setStorageSync('version', '1.0.6.sp11')
app.config.globalProperties.$version = uni.getStorageSync('version') app.config.globalProperties.$version = uni.getStorageSync('version')
app.use(globalMethods); app.use(globalMethods);
return { return {

28
pages/shopping/taobao/add-shopping-order/add-shopping-order.vue
View File

@ -236,16 +236,16 @@
</view> </view>
<view class="order-info card"> <view class="order-info card">
<view class="info-box"> <view class="info-box">
<view v-for="item in order.orderInfo" :key="item.key" <view v-for="item in order.orderInfo" :key="item.key" class="flex-justify-between item"
class="flex-justify-between item" style="align-items: flex-start;" @click="onClickItemInfo(item)"> style="align-items: flex-start;" @click="onClickItemInfo(item)">
<view class="lable" style="flex-shrink: 0; margin-top: 4rpx;"> <view class="lable" style="flex-shrink: 0; margin-top: 4rpx;">
<text style="white-space: nowrap;">{{ item.label }}</text> <text style="white-space: nowrap;">{{ item.label }}</text>
</view> </view>
<view class="flex-1 flex-align-center" <view class="flex-1 flex-align-center"
style="justify-content: flex-end;margin-left: 20rpx;width: 100px;"> style="justify-content: flex-end;margin-left: 20rpx;width: 100px;">
<auto-width-input class="value" v-model="item.value" fontSize="26rpx" <auto-width-input class="value" v-model="item.value" fontSize="26rpx" color="#7C8495"
color="#7C8495" :type="(item.type == 'address' || item.key == 'shippingInfo') ? 'textarea' : (item.type ? item.type : 'text')" show-edit :type="(item.type == 'address' || item.key == 'shippingInfo') ? 'textarea' : (item.type ? item.type : 'text')"
style="text-align: right;" show-edit style="text-align: right;"
:disabled="item.type == 'time' || item.type == 'timeRange'" /> :disabled="item.type == 'time' || item.type == 'timeRange'" />
</view> </view>
</view> </view>
@ -334,8 +334,11 @@
<view class="animate-scale flex-1"> <view class="animate-scale flex-1">
<auto-width-input v-model="order.shopName" fontSize="28rpx" fontWeight="600" color="#00032A" <auto-width-input v-model="order.shopName" fontSize="28rpx" fontWeight="600" color="#00032A"
placeholder="店铺名称" show-edit /> placeholder="店铺名称" show-edit />
<auto-width-input v-model="order.shopDesc" fontSize="26rpx" color="#7C8495"
placeholder="店铺描述" show-edit type="textarea" />
</view> </view>
</view> </view>
<view class="product-info flex-align-center" v-for="(goods, index) in order.goodsList" :key="index"> <view class="product-info flex-align-center" v-for="(goods, index) in order.goodsList" :key="index">
<image <image
style="width: 140rpx;height: 140rpx;margin-right: 24rpx;flex-shrink: 0;border-radius: 12rpx;" style="width: 140rpx;height: 140rpx;margin-right: 24rpx;flex-shrink: 0;border-radius: 12rpx;"
@ -366,13 +369,16 @@
<text class="value" style="color: #1A1A1A;">查看</text> <text class="value" style="color: #1A1A1A;">查看</text>
</view> </view>
<view v-show="!isFoldRefundOrderInfoCard || item.key == 'refunTime'" <view v-show="!isFoldRefundOrderInfoCard || item.key == 'refunTime'"
class="item flex-justify-between" style="align-items: flex-start;" v-for="item in order.orderInfo" class="item flex-justify-between" style="align-items: flex-start;"
:key="item.key" @click="onClickItemInfo(item)"> v-for="item in order.orderInfo" :key="item.key" @click="onClickItemInfo(item)">
<text class="label" style="flex-shrink: 0; white-space: nowrap; margin-top: 4rpx;">{{ item.label }}</text> <text class="label" style="flex-shrink: 0; white-space: nowrap; margin-top: 4rpx;">{{
<view class="flex-align-center flex-1" style="justify-content: flex-end; margin-left: 20rpx;"> item.label
}}</text>
<view class="flex-align-center flex-1"
style="justify-content: flex-end; margin-left: 20rpx;">
<auto-width-input class="value" v-model="item.value" fontSize="26rpx" color="#7C8495" <auto-width-input class="value" v-model="item.value" fontSize="26rpx" color="#7C8495"
:type="(item.type == 'address' || item.key == 'shippingInfo') ? 'textarea' : (item.type ? item.type : 'text')" show-edit :type="(item.type == 'address' || item.key == 'shippingInfo') ? 'textarea' : (item.type ? item.type : 'text')"
style="text-align: right;" show-edit style="text-align: right;"
:disabled="item.type == 'time' || item.type == 'timeRange'" /> :disabled="item.type == 'time' || item.type == 'timeRange'" />
</view> </view>
</view> </view>

1
pages/shopping/taobao/json/order.json
View File

@ -356,6 +356,7 @@
"statusDesc": "平台支持退款", "statusDesc": "平台支持退款",
"shopType": "taobao", "shopType": "taobao",
"refundMoney": "199.00", "refundMoney": "199.00",
"shopDesc": "好评率96%，平均6小时退款",
"refundIcon": 1, "refundIcon": 1,
"address": "上海市浦东新区汤臣一品", "address": "上海市浦东新区汤臣一品",
"userName": "张三", "userName": "张三",

22
pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue
View File

@ -37,7 +37,7 @@
<view v-if="order.statusType == 'wait_recv' || order.statusType == 'refunding'" class="card status-box" <view v-if="order.statusType == 'wait_recv' || order.statusType == 'refunding'" class="card status-box"
:style="{ 'margin-bottom': order.statusType == 'refunding' ? '16rpx' : '0' }"> :style="{ 'margin-bottom': order.statusType == 'refunding' ? '16rpx' : '0' }">
<image style="width: 34rpx;height: 34rpx;flex-shrink: 0;margin-right: 8rpx;" <image style="width: 34rpx;height: 34rpx;flex-shrink: 0;margin-right: 8rpx;"
:src="`/static/image/shopping/taobao/detail/${order.statusType == 'wait_recv' && order.isSignFor ? 'yiqianshou' : 'yunshuzhong'}.png`" :src="`/static/image/shopping/taobao/detail/${(order.statusType == 'wait_recv' && order.isSignFor || order.statusType == 'refunding') ? 'yiqianshou' : 'yunshuzhong'}.png`"
mode="aspectFill"></image> mode="aspectFill"></image>
<text class="status-text">{{ order.statusType == 'wait_recv' && !order.isSignFor ? '运输中' : '已签收' }}</text> <text class="status-text">{{ order.statusType == 'wait_recv' && !order.isSignFor ? '运输中' : '已签收' }}</text>
<text></text> <text></text>
@ -91,10 +91,11 @@
<view class="shop-name-box flex-align-center flex-justify-between refunding-style" <view class="shop-name-box flex-align-center flex-justify-between refunding-style"
v-if="order.statusType == 'refunding'"> v-if="order.statusType == 'refunding'">
<image v-if="order.shopImg" class="refund-shop" style="height: 70rpx;width: 70rpx;margin-right: 18rpx;" <image v-if="order.shopImg" class="refund-shop" style="height: 70rpx;width: 70rpx;margin-right: 18rpx;"
:src="order.shopImg"> :src="order.shopImg" mode="aspectFill">
</image> </image>
<view class="flex-1"> <view class="flex-1 flex-column">
<text class="shop-name">{{ order.shopName }}</text> <text class="shop-name">{{ order.shopName }}</text>
<text v-if="order.shopDesc" class="shop-desc">{{ order.shopDesc }}</text>
</view> </view>
<view class="flex-align-center"> <view class="flex-align-center">
<text style="font-size: 26rpx;color: #7C8495;line-height: 26rpx;">进店逛逛</text> <text style="font-size: 26rpx;color: #7C8495;line-height: 26rpx;">进店逛逛</text>
@ -106,7 +107,7 @@
<image style="height: 28rpx;" :src="`/static/image/shopping/taobao/${order.shopType}.png`" <image style="height: 28rpx;" :src="`/static/image/shopping/taobao/${order.shopType}.png`"
mode="heightFix"> mode="heightFix">
</image> </image>
<text class="shop-name">{{ order.shopName }}</text> <text class="shop-name">{{ order.shopName }} </text>
<uni-icons type="right" size="14" color="#8C8C8C"></uni-icons> <uni-icons type="right" size="14" color="#8C8C8C"></uni-icons>
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
@ -148,7 +149,7 @@
</view> </view>
<view class="refunding-desc"> <view class="refunding-desc">
<view class="flex-align-center"> <view class="flex-align-center">
<text class="label">退款成功</text> <text class="label" style="color:#F37120">退款成功</text>
<text class="value">{{ order.statusDesc }}</text> <text class="value">{{ order.statusDesc }}</text>
</view> </view>
<uni-icons color="#D8D8D8" type="right" size="12"></uni-icons> <uni-icons color="#D8D8D8" type="right" size="12"></uni-icons>
@ -613,7 +614,7 @@ const bottomBtnList = {
isPrimary: false isPrimary: false
}, },
{ {
name: '钱款去向', name: '再买一单',
isPrimary: true isPrimary: true
} }
] ]
@ -904,6 +905,15 @@ onUnmounted(() => {
margin: 0 4rpx; margin: 0 4rpx;
} }
.shop-desc {
font-weight: 400;
font-size: 24rpx;
color: #7C8495;
line-height: 22rpx;
margin: 0 4rpx;
margin-top: 12rpx;
}
&.refunding-style { &.refunding-style {
padding-bottom: 24rpx; padding-bottom: 24rpx;
border-bottom: 0.5px solid #D8D8D8 !important; border-bottom: 0.5px solid #D8D8D8 !important;