this is lastest update
This commit is contained in:
parent
d682e4e902
commit
f925c710f4
19
pages.json
19
pages.json
|
@ -1,5 +1,13 @@
|
|||
{
|
||||
"pages": [
|
||||
{
|
||||
"path": "pages/home/home",
|
||||
"style": {
|
||||
"navigationBarTitleText": "首页",
|
||||
// "enablePullDownRefresh":true, //开启下拉刷新
|
||||
"navigationBarBackgroundColor": "#ede8e7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
|
||||
"style": {
|
||||
|
@ -12,14 +20,7 @@
|
|||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/home/home",
|
||||
"style": {
|
||||
"navigationBarTitleText": "首页",
|
||||
// "enablePullDownRefresh":true, //开启下拉刷新
|
||||
"navigationBarBackgroundColor": "#ede8e7"
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path": "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
|
||||
"style": {
|
||||
|
@ -263,7 +264,7 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
}
|
||||
],
|
||||
"plugins": {
|
||||
"logisticsPlugin": {
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
|
||||
<view class="flex-col pos_2">
|
||||
<view class="flex-col list-item mt-15" v-for="(item, index) in orderList" :key="index">
|
||||
<view class="flex-col list-item mt-15" v-for="(item, index) in orderList" :key="index" @click="gotoDetailPage(item.id)">
|
||||
<view class="flex-row justify-between group">
|
||||
<text class="font_3">泠珑水月阁</text>
|
||||
<view class="flex-row items-center">
|
||||
|
@ -461,6 +461,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
const gotoDetailPage = (val) => {
|
||||
uni.navigateTo({
|
||||
url: '/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail?id=' + val
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const nav = () => { //导航
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
<view class="flex-row justify-between group">
|
||||
<view class="flex-row">
|
||||
<image
|
||||
class="image_3"
|
||||
src="https://ide.code.fun/api/image?token=67dd8f7cdefdb1001119a623&name=0c34cbad13bda42b94fffa906d29960d.png"
|
||||
class="image_3" mode="aspectFill"
|
||||
:src="publicPath + clothesSnapshot.image"
|
||||
/>
|
||||
<view class="ml-12 flex-col items-start group_2">
|
||||
<text class="font_2 text_4">{{ clothesSnapshot.name }}</text>
|
||||
|
@ -95,11 +95,11 @@
|
|||
|
||||
<script setup>
|
||||
import {ref,onMounted} from 'vue'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { clothesRentUrl } from '../../../common/globalImagesUrl';
|
||||
import { clothesRentOrderMap } from '../../../common/global';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
|
||||
import { publicPath } from '../../../common/globalImagesUrl';
|
||||
|
||||
const cookie = wx.getStorageSync('cookie')
|
||||
const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
|
||||
|
@ -109,18 +109,18 @@
|
|||
const orderStatusObj = ref({}) //订单状态----对应全局变量clothesRentOrderMap
|
||||
|
||||
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
|
||||
onMounted( async ()=>{
|
||||
getOrderDetail()
|
||||
})
|
||||
|
||||
// onLoad((options)=>{
|
||||
// getOrderDetail(options.id)
|
||||
// })
|
||||
onLoad((options)=>{
|
||||
getOrderDetail(options.id)
|
||||
})
|
||||
|
||||
const getOrderDetail = async (val) => {
|
||||
const res = await uni.request({
|
||||
|
@ -130,8 +130,7 @@
|
|||
cookie
|
||||
},
|
||||
data: {
|
||||
// id: val
|
||||
id: 18
|
||||
id: val
|
||||
}
|
||||
})
|
||||
// console.log('订单详情--->',res.data.data);
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
<view class="ml-20 flex-col items-start flex-1">
|
||||
<!-- <text class="text">微信用户</text> -->
|
||||
|
||||
<input class="text" type="nickname" :value="nickName" placeholder="请输入昵称" name="nickname"
|
||||
@blur="onUpdateNick" />
|
||||
<input class="text" type="nickname" v-model="nickName" placeholder="请输入昵称" name="nickname"
|
||||
@blur="onUpdateNick" maxlength="10"/>
|
||||
<text class="mt-18 font text_2">剩余积分:{{ myPoints }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -42,7 +42,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col mt-37">
|
||||
<view class="flex-col mt-20">
|
||||
<view class="flex-col group_3">
|
||||
<view class="flex-row justify-between relative" @click="jump_addressList">
|
||||
<image class="image_3" :src="mineUrl + '/main/address.png'" />
|
||||
|
@ -131,6 +131,7 @@
|
|||
import { mineUrl } from '../../../common/globalImagesUrl';
|
||||
import { publicPath } from '../../../common/globalImagesUrl';
|
||||
import { onPullDownRefresh } from '@dcloudio/uni-app';
|
||||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
|
||||
const bkgUrl = ref(mineUrl + '/main/bkg.png')
|
||||
|
||||
|
@ -244,6 +245,15 @@
|
|||
|
||||
const nickName = ref('非遗雅士')
|
||||
const onUpdateNick = (e) => {
|
||||
if (JudgeIsNullity(nickName.value)) {
|
||||
getMyUser()
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '呢称不能为空',
|
||||
showCancel: false
|
||||
})
|
||||
return
|
||||
}
|
||||
nickName.value = e.detail.value
|
||||
updateMyUser()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user