add

2024-07-11 16:50:31 +08:00 · 2024-07-11 16:46:19 +08:00 · 2024-07-10 16:03:34 +08:00 · 2024-07-06 16:20:28 +08:00 · 2024-07-06 13:55:06 +08:00
10 changed files with 1070 additions and 945 deletions
--- a/api/order.js
+++ b/api/order.js
@ -75,3 +75,7 @@ export const refundReasonListApi = (data) => {
 export const applyRefundApi = (data) => {
 	return request.post('/order/order/apply_refund', data);
 }
+
+export const UserProductStorageLogApi = (data) => {
+	return request.get('/user_product_storage_log/UserProductStorageLog/lists', data);
+}
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@ -63,14 +63,7 @@
 		computed,
 		nextTick,
 		ref,
-
 	} from "vue"
-	import {
-		toast
-	} from "../uni_modules/uview-plus";
-	import {
-		onShow
-	} from '@dcloudio/uni-app';

 	const foucs1 = ref(null)
 	const props = defineProps({
@ -78,20 +71,17 @@
 			type: Boolean,
 			default: false
 		},
+		priceKey: {
+			type: Object,
+			default: () => ({})
+		}
+
 	})

 	const valChange = () => {
 		uni.vibrateShort();
 	}

-	let priceKey = ref({})
-	if (uni.getStorageSync('PRICE_KEY')) {
-		priceKey.value = JSON.parse(uni.getStorageSync('PRICE_KEY'));
-	} else {
-		priceKey.value = {};
-	}
-
-
 	const datas = ref({
 		cart_num: ''
 	});
@ -121,7 +111,9 @@

 	const subtotal = computed(() => {
 		let num = +datas.value.cart_num || 1;
-		let sell = +datas.value[priceKey.value.off_activity == 1 ? priceKey.value.price : priceKey.value.op_price];
+		let sell = +datas.value[props.priceKey.off_activity == 1 ? props.priceKey.price : props
+			.priceKey
+			.op_price];
 		return Number(num * sell * 100 / 100).toFixed(2)
 	})

--- a/pageQuota/asset/index.vue
+++ b/pageQuota/asset/index.vue
@ -1,4 +1,5 @@
 <template>
+	<block v-if="lists.length">
 		<view class="m-card m-good" v-for="(item, index) in lists" :key="index">
 			<view class="shop-check" @click="item.check=!item.check">
 				<image v-if="!item.check" src="@/static/icon/n-check.png"></image>
@ -22,6 +23,11 @@
 				</view>
 			</view>
 		</view>
+
+	</block>
+
+	<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
+	</up-empty>
 	<view style="height: 200rpx;" />

 	<view class="bottom">
--- a/pageQuota/asset/lists.vue
+++ b/pageQuota/asset/lists.vue
@ -0,0 +1,137 @@
+<template>
+	<up-sticky bgColor="#fff" style="padding: 20rpx;">
+		<up-tabs :list="tabsLst" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
+			:current='currentTab' @change="tabsChange"></up-tabs>
+	</up-sticky>
+	<view class="content" v-if="lists.length">
+		<view class="card" v-for="(item,index) in lists" :key="item.id">
+			<view class="head">
+				<view class="">
+					{{item.system_store_name}}
+				</view>
+				<view v-if="currentTab==0" style="text-decoration: underline;text-underline-offset: 5rpx;"
+					@click="hdClick(item)">
+					提货码
+				</view>
+			</view>
+			<view class="card-li" v-if="currentTab==0">
+				<text class="lab">预约时间：</text>{{item.times}}
+			</view>
+			<view class="card-li" v-if="currentTab==1">
+				<text class="lab">提货时间：</text>{{item.update_time}}
+			</view>
+			<view class="card-li" style="display: flex;justify-content: space-between;">
+				<view class="">
+					<text class="lab">商品信息：</text>{{item.store_name}}
+				</view>
+				<view class="">
+					x{{item.nums}}
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
+	</up-empty>
+
+	<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
+		<view
+			style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
+			<up-image :src="orderData.verify_img" width="710rpx" height="105rpx"></up-image>
+			<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
+				提货码 {{orderData.verify_code}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue"
+	import {
+		UserProductStorageLogApi
+	} from "@/api/order.js"
+	import useUserStore from "@/store/user";
+
+	const userStore = useUserStore().userInfo;
+	const currentTab = ref(0)
+	const showVerifyPop = ref(false)
+	const orderData = reactive({})
+	const tabsLst = reactive([{
+			name: '已预约'
+		},
+		{
+			name: '已提货'
+		},
+
+	]);
+
+	const tabsChange = (e) => {
+		currentTab.value = e.index
+		getLists()
+	}
+
+
+	const lists = ref([{}])
+	const getLists = async () => {
+		let res = await UserProductStorageLogApi({
+			uid: userStore.id,
+			status: currentTab.value
+		})
+		lists.value = res.data.lists
+	}
+
+	const hdClick = (item) => {
+		orderData.verify_code = item.verify_code
+		orderData.verify_img = item.verify_img
+		showVerifyPop.value = true
+	}
+
+	getLists()
+</script>
+
+<style lang="scss">
+	.content {
+		padding: 20rpx;
+	}
+
+
+	.card {
+		background-color: white;
+		border-radius: 20rpx;
+		// padding: 20rpx;
+		margin-bottom: 20rpx;
+		padding-bottom: 20rpx;
+
+		.head {
+			background-color: #50C758;
+			border-radius: 20rpx 20rpx 0 0;
+			color: white;
+			padding: 20rpx;
+			font-size: 30rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.card-li {
+			padding: 0 20rpx;
+			margin-top: 10rpx;
+
+			.lab {
+				color: #989898;
+			}
+		}
+	}
+
+	.mask {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, .5);
+		top: 0;
+		left: 0;
+		z-index: 99999 !important;
+	}
+</style>
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@ -1,4 +1,5 @@
 <template>
+	<!-- 门店及身份选择 -->
 	<view class="" v-if="!STORE_INFO.id">
 		<up-modal :show="showModa" title="登录门店" @confirm="confirmStore" confirmColor='#20B128'>
 			<view class="slot-content">
@ -7,7 +8,7 @@
 						<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
 					</up-form-item>
 				</up-form>
-				<up-form labelPosition="left" label-width="100rpx">
+				<!-- <up-form labelPosition="left" label-width="100rpx">
 					<up-form-item label="身份" borderBottom>
 						<up-radio-group v-model="Role" placement="row">
 							<up-radio activeColor="#20b128" label="行业会员" :name="1"
@ -15,10 +16,11 @@
 							<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
 						</up-radio-group>
 					</up-form-item>
-				</up-form>
+				</up-form> -->
 			</view>
 		</up-modal>
 	</view>
+	<!-- 门店及身份选择结束 -->

 	<view v-else>
 		<up-sticky bgColor="#fff" style="padding: 20rpx;">
@ -27,7 +29,8 @@
 			<up-tabs v-else :list="tabsLst2" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
 				:current='currentTab' @change="tabsChange1"></up-tabs>
 		</up-sticky>
-		<!-- tabs0 -->
+
+		<!-- 开通行业会员 -->
 		<block v-if='currentTab == 0'>
 			<view class="card card1">
 				<view class="card1-tit">
@ -52,8 +55,8 @@
 					</up-form-item>
 					<up-form-item label="">
 						<view @click="showPop = true" style="width: 100%;">
-							<up-input style="pointer-events: none" v-model="formData.address" border="none"
-								prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{
+							<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map"
+								readonly placeholder="点击选择地址" :customStyle="{
 									background: '#F3F3F3', padding: '20rpx',
 									'border-radius': '30rpx'
 								}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"
@ -107,7 +110,9 @@

 			</view>
 		</block>
+		<!-- 开通行业会员结束 -->

+		<!-- 追加经营资金 -->
 		<block v-if="currentTab == 1 && Role == 1">
 			<view class="card card1">
 				<view class="card1-tit">
@ -126,12 +131,11 @@
 						<up-input v-model="formData2.real_name" disabled border="none" prefixIcon="account"
 							placeholder="系统自动获取" color='grey'
 							:customStyle="{ background: '#F3F3F3', padding: '20rpx', 'border-radius': '30rpx' }"
-							:placeholderStyle="{ color: 'grey' }"
-							:prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
+							:placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
 					</up-form-item>
 					<up-form-item label="">
-						<up-input style="pointer-events: none" v-model="formData2.address" border="none"
-							prefixIcon="map" readonly color='grey' placeholder="系统自动获取" :customStyle="{
+						<up-input style="pointer-events: none" v-model="formData2.address" border="none" prefixIcon="map"
+							readonly color='grey' placeholder="系统自动获取" :customStyle="{
 								background: '#F3F3F3', padding: '20rpx',
 								'border-radius': '30rpx'
 							}" :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
@ -179,30 +183,29 @@
 			</view>

 		</block>
+		<!-- 追加经营资金结束 -->

-
-		<!-- tabs2 -->
+		<<<<<<< HEAD <!-- tabs2 -->
+			=======
+			<!-- 开通列表-会员 -->
+			>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
 			<block v-if="currentTab == 2 && Role == 1">
 				<view class="vip-card">
 					<text>当前已开通：</text>
 					<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
+					<text>位行业会员 </text>
 				</view>

 				<view class="table">
 					<uni-table stripe emptyText="暂无更多数据" width="100%">
-					<!-- 表头行 -->
 						<uni-tr>
-						<!-- <uni-th width="20" align="center">序号</uni-th> -->
 							<uni-th width="50" align="center">行业会员</uni-th>
 							<uni-th width="50" align="center">经营资金</uni-th>
 							<uni-th width="50" align="center">开通时间</uni-th>
 							<uni-th width="50" align="center">角色</uni-th>
 							<uni-th width="50" align="center">状态</uni-th>
 						</uni-tr>
-					<!-- 表格数据行 -->
 						<uni-tr v-for="(item, index) in lists" :key="item.order_id">
-						<!-- <uni-td align="center">{{index+1}}</uni-td> -->
 							<uni-td style="font-size: 20rpx;" align="center">
 								<view>
 									{{ item.real_name }}
@ -229,21 +232,20 @@
 					</uni-table>
 				</view>
 			</block>
+			<!-- 开通列表-会员结束 -->

-
-
+			<<<<<<< HEAD=======<!-- 开通列表-商户 -->
+				>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
 				<block v-if="currentTab == 1 && Role == 4">
 					<view class="vip-card">
 						<text>当前已开通：</text>
 						<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
+						<text>位商户</text>
 					</view>

 					<view class="table">
 						<uni-table stripe emptyText="暂无更多数据" width="100%">
-					<!-- 表头行 -->
 							<uni-tr>
-						<!-- <uni-th width="20" align="center">序号</uni-th> -->
 								<uni-th width="50" align="center">商户</uni-th>
 								<uni-th width="50" align="center">查看号码</uni-th>
 								<uni-th width="50" align="center">开通时间</uni-th>
@ -251,21 +253,20 @@
 							</uni-tr>
 							<!-- 表格数据行 -->
 							<uni-tr v-for="(item, index) in lists" :key="item.order_id">
-						<!-- <uni-td align="center">{{index+1}}</uni-td> -->
 								<uni-td style="font-size: 20rpx;" align="center">{{ item.nickname }}</uni-td>
 								<uni-td style="font-size: 20rpx;" align="center">{{ item.mobile }}</uni-td>
 								<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
 								<uni-td style="font-size: 20rpx;" align="center">
 									<view>已开通</view>
-
 								</uni-td>
 							</uni-tr>
 						</uni-table>
 					</view>
 				</block>
+				<!-- 开通列表-商户结束 -->
+
 	</view>
 	<view style="height: 50rpx;" />
-
 	<!-- 地址选择器 -->
 	<up-popup :show="showPop" @close="showPop = false" @open="showPop = true" :round="10">
 		<view style="padding: 20rpx;">
@ -273,8 +274,8 @@
 				:activeStyle="{ color: '#20B128' }"></up-tabs>
 			<up-line style="margin-top:20rpx "></up-line>
 			<view class="address-content" v-if='currentAddressIndex == 0'>
-				<view class="address-li" :class='{ act: item.city_code == formData.city }'
-					v-for="item in addressList.city" :key="item.city_code" @click="addressLiClick(0, item)">
+				<view class="address-li" :class='{ act: item.city_code == formData.city }' v-for="item in addressList.city"
+					:key="item.city_code" @click="addressLiClick(0, item)">
 					<text>{{ item.city_name }}</text>
 					<up-icon name="arrow-right" :color="item.city_code == formData.city ? '#20B128' : '#777777'" />
 				</view>
@ -297,21 +298,22 @@
 				<view class="address-li" v-for="item in addressList.village" @click="addressLiClick(3, item)"
 					:key="item.village_code" :class='{ act: item.village_code == formData.village }'>
 					<text>{{ item.village_name }}</text>
-					<up-icon name="arrow-right"
-						:color="item.village_code == formData.village ? '#20B128' : '#777777'" />
+					<up-icon name="arrow-right" :color="item.village_code == formData.village ? '#20B128' : '#777777'" />
 				</view>
 			</view>
 			<view class="address-content" v-else-if='currentAddressIndex == 4'>
-				<view class="address-li" :class='{ act: item.id == formData.brigade }'
-					v-for="item in addressList.brigade" :key="item.id" @click="addressLiClick(4, item)">
+				<view class="address-li" :class='{ act: item.id == formData.brigade }' v-for="item in addressList.brigade"
+					:key="item.id" @click="addressLiClick(4, item)">
 					<text>{{ item.brigade_name }}</text>
 					<up-icon name="arrow-right" :color="item.id == formData.brigade ? '#20B128' : '#777777'" />
 				</view>
 			</view>
 		</view>
 	</up-popup>
+	<!-- 会员类型选择器 -->
 	<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1 = false'
 		@close="showPop1 = false" @open="showPop1 = true" keyName='title' confirmColor='#33B83A'></up-picker>
+	<!-- 会员号码查看modal -->
 	<up-modal :show="showModal" title="电话号码" content='15884967539' :closeOnClickOverlay="true" :zoom="true"
 		confirmColor='#33B83A' @confirm='showModal = false' @close="showModal = false">
 		<view class="slot-content">
@ -358,14 +360,13 @@
 	config
 } from "@/config/app.js"

+const currentTab = ref(0)
 const showModal = ref(false)
 const showPop1 = ref(false)
 const Role = ref(1)
 const popPhone = ref('')
-	// const range = ref({})
 const columns = ref([])
 const showModa = ref(true)
-	const storePhone = ref('')
 const tabsLst = reactive([{
 	name: '开通行业会员'
 },
@ -376,7 +377,6 @@
 	name: '已开通列表'
 },
 ]);
-
 const tabsLst2 = reactive([{
 	name: '开通商户'
 },
@ -384,8 +384,7 @@
 	name: '已开通列表'
 },
 ]);
-
-
+const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])

 const tabsChange = (e) => {
 	currentTab.value = e.index
@ -393,13 +392,18 @@
 		getCount()
 		getLists()
 	}
-		// getLists()
 }
+
 const tabsChange1 = (e) => {
 	currentTab.value = (e.index)
 	getLists()
 }

+//  用户选择的门店信息
+const storePhone = ref('')
+let STORE_INFO = reactive({
+	id: "",
+})
 const confirmStore = () => {
 	getStoreByPhone({
 		phone: storePhone.value
@ -412,11 +416,6 @@
 		uni.$u.toast('未查到店铺信息，请检查手机号码')
 	})
 }
-	//  用户选择的门店信息
-	let STORE_INFO = reactive({
-		id: ""
-	})
-

 // 门店手机号保留一天
 const setPhoneOneDay = () => {
@ -430,7 +429,7 @@
 	}));
 }
 const getPhoneOneDay = () => {
-		if (uni.getStorageSync('VIP_PHONE')) {
+	if (!uni.getStorageSync('VIP_PHONE')) return;
 	let data = JSON.parse(uni.getStorageSync('VIP_PHONE'))
 	if (new Date() > data.time) {
 		uni.removeStorageSync('VIP_PHONE');
@ -438,11 +437,9 @@
 		storePhone.value = data.phone
 	}
 }
-	}
 // 手机保留一天结束

 // 验证码
-	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
 const cutDown = ref(0)
 const flag = ref(true)
 const code = ref('')
@ -467,9 +464,6 @@
 	}, 1000)
 }
 // 验证码结束
-
-
-	const currentTab = ref(0)
 const formData = reactive({
 	store_id: STORE_INFO.id,
 	mobile: "",
@ -488,21 +482,6 @@
 	code: '',
 	brigade: "",
 	price: "",
-		// store_id: STORE_INFO.id,
-		// mobile: "19130550023",
-		// province: 510000,
-		// city: '510500',
-		// area: "510503",
-		// street: "510503102",
-		// village: "510503102201",
-		// real_name: "赵明军",
-		// auth_code: "131197337173621549",
-		// address: "",
-		// label_name: "",
-		// label_id: "4",
-		// user_ship: '1',
-		// price: 0.02,
-		// code: '12'
 })


@ -557,7 +536,7 @@
 				mobile: formData.mobile
 			})
 			formData2.mobile = formData.mobile
-				if (data.user_ship == 4 || data.user_ship == 0) return;
+			if (data.user_ship == 0) return;
 			if (Role.value == 1) {
 				uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
 				currentTab.value = 1
@ -619,7 +598,6 @@
 	showPop1.value = false
 }

-
 // 地址选择
 const showPop = ref(false)
 const currentAddressIndex = ref(0)
--- a/pages.json
+++ b/pages.json
@ -245,10 +245,17 @@
 				{
 					"path": "asset/index",
 					"style": {
-						"navigationBarTitleText": "会员资产",
+						"navigationBarTitleText": "用户资产",
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "asset/lists",
+					"style": {
+						"navigationBarTitleText": "预约记录",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "Gifts/index",
 					"style": {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -168,15 +168,15 @@
 								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
 										style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
 								</view>
-								<view class="tag">
+								<view class="tag" v-if="item.tag">
 									<view class="icon" />
-									赠10%品牌礼品券
+									{{item.tag}}
 								</view>
 							</view>
-							<!-- <view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
+							<view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
 								<view class="shop-content-li-l">原价</view>
 								<view class="shop-content-li-r line-through">￥{{item[priceKey.op_price]}}</view>
-							</view> -->
+							</view>

 							<view class="shop-content-li" v-else>
 								<view class="shop-content-li-l">售价</view>
@ -231,7 +231,8 @@
 			</view>
 		</view>

-		<goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup = false" @change="changeGood" />
+		<goodPopup ref="goodRef" :priceKey='priceKey' :show="showGoodPopup" @close="showGoodPopup = false"
+			@change="changeGood" />

 		<u-overlay :show="showOverlay" @click="showOverlay = false">
 			<view class="warp">
@ -293,7 +294,7 @@
 	} from "@/api/multipleShop.js";

 	import useUserStore from "@/store/user";
-	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
+	const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
 		id: '',
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -16,10 +16,10 @@
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
 								size="28"></up-icon>手机号快捷登录</up-button>
 					</view>
-					<!-- <view class="btn">
+					<view class="btn" v-if="config.ENV !='prod'">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
-					</view> -->
+					</view>
 					<!-- <view class="btn">
            <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                size="28"></up-icon>公众号授权</up-button>
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@ -24,7 +24,7 @@
 <template>
 	<view style="flex-grow: 1;overflow-y: auto;">
 		<view class="user-info"
-			:style="{backgroundImage: [0,4].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
+			:style="{backgroundImage: [0].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
 			<view class="u-card">
 				<view style="display: flex;" @click="updataInfp">
 					<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
@ -36,7 +36,7 @@
 							<view style="margin:0 20rpx;">
 								{{userInfo.id}}
 							</view>
-							<view v-if="![0,4].includes(userInfo.user_ship)"
+							<view v-if="![0].includes(userInfo.user_ship)"
 								style="display: flex;align-items: center;background-color: #F6EECD;padding: 4rpx 10rpx;border-radius: 20rpx;">
 								<view style="margin-right: 10rpx;">
 									<up-icon
@ -116,8 +116,9 @@

 		<view class="card">
 			<up-cell-group>
-				<!-- 	<up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell>
-				<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell> -->
+				<!-- 	<up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> -->
+				<!-- <up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
+				<up-cell title="预约记录" :isLink="true" url="/pageQuota/asset/lists"></up-cell> -->
 				<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
 				<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
 			</up-cell-group>
@ -226,7 +227,6 @@
 	const showPop = ref(false)

 	const updataInfp = () => {
-		console.log(5454)
 		showPop.value = true
 	}

@ -291,7 +291,7 @@
 			userInfo.value = res.data;
 			formData.avatar = res.data.avatar
 			formData.nick_name = res.data.nickname
-			if (![0, 4].includes(res.data.user_ship)) {
+			if (![0].includes(res.data.user_ship)) {
 				uni.setNavigationBarColor({
 					frontColor: "#000000",
 					backgroundColor: "#EAFFE1"
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@ -98,7 +98,7 @@
 			<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
 				<view>优惠减免</view>
 				<view>
-					<text>-¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
+					<text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
 				</view>
 			</view>
 			<view class="row" v-if="userInfo.user_ship==1 ">
Author	SHA1	Message	Date
zmj	76daf934b1	add	2024-07-11 16:50:31 +08:00
zmj	ae7660e239	add	2024-07-11 16:46:19 +08:00
zmj	55e5572005	add	2024-07-10 16:03:34 +08:00
zmj	801d2cb413	add	2024-07-06 16:20:28 +08:00
zmj	77d4938aee	add	2024-07-06 13:55:06 +08:00