angelo
/
web-store-retail-h5
forked from angelo/web-retail-h5
3
0
Fork 0
Code Pull Requests Activity

feat(order): 移除奖衔展示，添加确认收货按钮

This commit is contained in:
woody 2025-06-20 14:30:25 +08:00
parent 3e3399c1ed
commit 41e3f87453
6 changed files with 106 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/order.js
View File

@ -50,3 +50,7 @@ export const validRelation = params =>
// 升级订单
export const upgradeOrder = data =>
http.post('/sale/api/retail-order/confirm-upg-order', data)
// 确认收货
export const confirmReceipt = orderCode =>
http.put(`/sale/api/my-order/confirm/${orderCode}`)

2
config/request.js
View File

@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
config.baseURL = 'http://t-app.beida777.com/prod-api'
config.baseURL = 'http://192.168.0.104:8080'
//#endif
//#ifdef QA_SERVER

120
manifest.json
View File

@ -1,34 +1,34 @@
{
"name": "retail-h5",
"appid": "__UNI__31B4587",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"name" : "retail-store-h5",
"appid" : "__UNI__31B4587",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* 模块配置 */
"modules": {
"Bluetooth": {},
"Barcode": {},
"Camera": {},
"Fingerprint": {},
"FaceID": {}
"modules" : {
"Bluetooth" : {},
"Barcode" : {},
"Camera" : {},
"Fingerprint" : {},
"FaceID" : {}
},
/* 应用发布信息 */
"distribute": {
"distribute" : {
/* android打包配置 */
"android": {
"permissions": [
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -45,62 +45,58 @@
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters": [
"armeabi-v7a",
"arm64-v8a",
"x86"
]
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios打包配置 */
"ios": {
"dSYMs": false
"ios" : {
"dSYMs" : false
},
/* SDK配置 */
"sdkConfigs": {
"push": {}
"sdkConfigs" : {
"push" : {}
}
}
},
/* 快应用特有相关 */
"quickapp": {},
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin": {
"appid": "wxe26d23c09932e93b",
"setting": {
"urlCheck": false,
"es6": false,
"minified": false
"mp-weixin" : {
"appid" : "wxe26d23c09932e93b",
"setting" : {
"urlCheck" : false,
"es6" : false,
"minified" : false
},
"usingComponents": true
"usingComponents" : true
},
"mp-alipay": {
"usingComponents": true
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu": {
"usingComponents": true
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao": {
"usingComponents": true
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics": {
"enable": false
"uniStatistics" : {
"enable" : false
},
"vueVersion": "2",
"h5": {
"template": "index.html",
"router": {
"mode": "hash"
"vueVersion" : "2",
"h5" : {
"template" : "index.html",
"router" : {
"mode" : "hash"
},
"devServer": {
"https": false,
"port": 8899,
"proxy": {
"/prod-api": {
"target": "http://t-mana.beida777.com",
"changeOrigin": true
"devServer" : {
"https" : false,
"port" : 8999,
"proxy" : {
"/prod-api" : {
"target" : "http://t-mana.beida777.com",
"changeOrigin" : true
}
}
}
},
"fallbackLocale": "zh-Hans"
"fallbackLocale" : "zh-Hans"
}

2
pages/index/index.vue
View File

@ -98,7 +98,7 @@
ref="child2"
@childMethodTrigger="callChildMethod"
></znNewsPopup>
<RegionSelect v-if="userInfo.memberCode != 'BF66886688'" />
<!-- <RegionSelect v-if="userInfo.memberCode != 'BF66886688'" /> -->
<!-- 直推排行弹窗
<directrank-popup
@callznMethodTrigger="callznMethod"

12
pages/mine/index.vue
View File

@ -22,9 +22,8 @@
<text class="svip-text">{{ userInfo.pkGradeVal || '-' }}</text>
</view>
</view>
<view class="awards-container">
<!-- <view class="awards-container">
<view class="award-tag">
<!-- <u-icon name="star-fill" color="#FAD65A" size="14"></u-icon> -->
<text class="award-label">荣誉奖衔:</text>
<text class="award-value">{{
userInfo.pkMaxAwardsVal || userInfo.pkAwardsVal || '无'
@ -32,7 +31,6 @@
</view>
<view style="display: flex; gap: 10rpx">
<view class="award-tag">
<!-- <u-icon name="star-fill" color="#FAD65A" size="14"></u-icon> -->
<text class="award-label">当月奖衔:</text>
<text class="award-value">{{
userInfo.pkAwardsVal || '无'
@ -43,7 +41,7 @@
<text class="award-value">{{ userInfo.pkRangeAwardsVal }}</text>
</view>
</view>
</view>
</view> -->
</view>
</view>
<view
@ -338,11 +336,11 @@
</u-button>
</view>
</u-popup>
<RegionSelect
<!-- <RegionSelect
v-if="isNormal"
ref="regionSelect"
@success="getRegionSelect"
/>
/> -->
<!-- <talentList :drShow="drShow" @closeShow="closeShow"></talentList> -->
</view>
</template>
@ -480,7 +478,7 @@ export default {
return
}
this.isNormal = isNormal
this.getRegionSelect()
// this.getRegionSelect()
this.getMemberBoxCount()
this.getMarketDynamicBoxCount()
// this.getUserAwardss()

37
pages/mine/order/index.vue
View File

@ -104,6 +104,15 @@
:text="'查看物流'"
color="#005BAC"
></u-button>
<u-button
type="primary"
v-if="item.orderStatus == 3"
@click="confirmReceipt(item)"
shape="circle"
style="margin-left: 10px"
:text="'确认收货'"
color="#005BAC"
></u-button>
</view>
</view>
</view>
@ -493,6 +502,34 @@ export default {
this.cancelCode = val.orderCode
this.cancleOrder = true
},
confirmReceipt(item) {
uni.showModal({
title: '提示',
content: '确认收货?',
success: res => {
if (res.confirm) {
api.confirmReceipt(item.orderCode).then(res => {
if (res.code == 200) {
uni.showToast({
title: '确认收货成功',
icon: 'none',
duration: 1500,
})
this.queryParams.pageNum = 1
this.orderLists = []
this.getDataList()
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 1500,
})
}
})
}
},
})
},
getDetails(item) {
uni.showLoading({
title: '加载中',