feat:提交代码

pages.config.ts

@@ -51,4 +51,5 @@ export default defineUniPages({
 		backgroundColorTop: '@bgColorTop',
 		backgroundColorBottom: '@bgColorBottom',
 	},
+	
 })

src/apis/user.ts

@@ -296,10 +296,10 @@ export function apigetAccount() {
     })
 }
 
-export function apiTransitionVr(num:any) {
+export function apiTransitionVr(num:any,type:any) {
     return defHttp.post({
         url: API.TRANSITION_VR,
-		data:{extract_amount:num}
+		data:{extract_amount:num ,type:type}
     })
 }
 

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -31,7 +31,7 @@ function getPhoneNumber(e) {
             encryptedData: e.detail.encryptedData,
             iv: e.detail.iv,
           }
-		  openId= unionRes.openid
+		  openId= unionRes.unionid
           if (shareId) {
             params.share_id = shareId
           }

src/pages/order/components/AllItemList.vue

@@ -143,7 +143,6 @@ onUnmounted(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
-		  {{orderItem.source}}
        <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
 		<OtherOrderItem :item="orderItem" v-else />
       </div>

src/pages/order/components/ObligationOrderList.vue

@@ -33,30 +33,34 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize,
   }).then((res) => {
-    console.log('>>>>>>111', res)
+	  
+	  console.log("===res",res);
     if (res.list.length <= 0) {
       uni.$emit('changeShowLike')
       console.log('没有数据')
 	  state.list = res.list
-	  if (callback)
-	    callback(res.list)
-
+	  if (callback){
+		  callback(res.list)
+	  }
       return
     }
     if (res.count < state.pageSize)
       uni.$emit('changeShowLike')
 
-    if (action === 'page')
-      state.list = state.list.concat(res.list)
+   if (action === 'page')
+     state.list = state.list.concat(res.list)
 
-    if (action == 'reload')
-      state.list = res.list
+   if (action == 'reload')
+     state.list = res.list
 
     state.totalPage = Math.ceil(res.total / state.pageSize)
 
-    state.status = 'more'
-    if (callback)
-      callback(res.list)
+   state.status = 'more'
+    if (callback){
+	 	callback(res.list)
+   }
+	
+	
   })
 }
 watch(() => state.status, (newStatus, oldStatus) => {
@@ -114,7 +118,7 @@ onUnmounted(() => {
 <template>
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col">
-      <div v-for="(orderItem, index) in state.list" :key="index">
+      <div v-for="(orderItem, index) in state?.list" :key="index">
         <!--        <OrderItem :order-item="orderItem" /> -->
         <!--        <OtherOrderItem :item="orderItem" v-else/> -->
         <OrderObligationItem :order-item="orderItem" :tab-value="props.tabValue" />

src/pages/order/components/OrderObligationItem.vue

@@ -26,28 +26,8 @@ const props = defineProps({
 
 
 
-
-// function detailOrderList(p) {}
-// const dealOrderList =computed(() => {
-//   if (props.orderItem) {
-//     const orderItem = props.orderItem
-//     if (orderItem?.orderList) {
-//       return orderItem.orderList
-//     }
-//     if (orderItem?.orderProduct) {
-//       return orderItem.orderProduct
-//     }
-//   }
-// })
 function getStatusText(orderItem: OrderListModel) {
-  // if (props.status === 5) {
-  //   return '未支付'
-  // }
-  // if (props.status === 0) {
-  //   return '待发货'
-  // }
-  // switch (orderItem.status) {
-  // }
+
   if (orderItem.status == 0) {
     return '待发货'
   }

src/pages/order/index.vue

@@ -76,6 +76,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   getRecommendList({
     ...params
   }).then(res => {
+	  
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -85,6 +86,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     }
     state.totalPage = Math.ceil(res.count / state.pageSize);
     state.statusLike = 'more'
+	
     if (callback) {
       callback(res.list)
     }
@@ -110,6 +112,7 @@ function handleProductItemClick(
 
 onReachBottom(() => {
   // handleScrollToLower()
+  
   if (state.tabvalue == 0) {
     uni.$emit('onTab0ReachBottom')
   }
@@ -149,11 +152,7 @@ onPullDownRefresh(() => {
   if (nomore.value == 'nomore') {
     handleScrollToLower()
   }
-  // loadList('reload', items => {
-  //   setTimeout(() => {
-  //     uni.stopPullDownRefresh()
-  //   }, 300)
-  // })
+
 })
 
 watch(() => state.tabvalue, (newStatus, oldStatus) => {
@@ -235,34 +234,7 @@ function onClickLeft() {
       <Order3List v-if="state.tabvalue == 3" :status="'1'" />
       <Order4List v-if="state.tabvalue == 4" :status="'2'" />
     </div>
-    <!-- 商品推荐 -->
-    <div v-if="toshow == true">
-      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3">
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-        <div>
-          精品推荐
-        </div>
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-      </div>
-      <div class="pb-3 px-3 pb-safe" v-if="state.list">
-        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
-          <div v-for="(item, index) in state.list" :key="index" @click="handleProductItemClick(item)">
-            <MerchantProductCard :item="item" />
-
-          </div>
-        </grid-view>
-
-        <div class=" flex justify-center items-center text-[12px] text-gray-500">
-          <div v-if="state.statusLike === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.statusLike === 'noMore'">
-            没有更多了～
-          </div>
-        </div>
-      </div>
-
-    </div>
+    
   </div>
   <!--  </CXBBasePage>-->
 </template>

src/pages/order_addcart/index.vue

@@ -786,13 +786,13 @@ function handlePageClick() {
       </div>
 
       <div class="pb-12" >
-        <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
+        <!-- <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
           <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
           <div>
             精品推荐
           </div>
           <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-        </div>
+        </div> -->
 
         <div class="pb-3 px-3" v-if="state.recommendList">
           <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">

src/pages/real-name-authentication/components/authentication-success.vue

@@ -1,17 +1,62 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
+	import { CDN_URL } from "~/config/app";
+	const props = defineProps({
+	  formData: {
+	    type: Object,
+	    default: {}
+	  }
+	})
 
-const image = CDN_URL + '/static/assets/authentication_success_220714.png'
+	const image = CDN_URL + '/static/assets/authentication_success_220714.png'
 </script>
 <template>
 
-  <div>
-    <div class="flex flex-col justify-center items-center gap-3 bg-white p-4">
-      <image :src="image" mode="widthFix" class="w-12 h-12"></image>
-      <div>
-        您已通过实名认证
-      </div>
-    </div>
+	<div>
+		<div class="flex flex-col justify-center items-center gap-3 bg-white p-4">
+			<image :src="image" mode="widthFix" class="w-12 h-12"></image>
+			<div class="main-title">
+				您已完成实名认证
+			</div>
 
-  </div>
+		</div>
+
+	</div>
 </template>
+
+<style scoped lang="scss">
+	.main-title {
+		font-size: 30rpx;
+		color: #333;
+
+	}
+
+	.user-content {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		
+		.user-item-line{
+			width: 100%;
+			height: 1rpx;
+			background-color: #eeeeee;
+		}
+	}
+
+	.user-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 30rpx 40rpx;
+
+		.user-item-title {
+			font-size: 26rpx;
+			color: #333;
+			flex: 1;
+		}
+
+		.user-item-des {
+			font-size: 26rpx;
+			color: #999;
+		}
+	}
+</style>

src/pages/real-name-authentication/index.vue

@@ -1,314 +1,348 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-import {UPLOAD_URL} from "~/utils/http";
-import {getToken} from "~/utils/auth";
-import {uploadImageOne} from "~/utils/upload";
-import {backdropFilterBase} from "unocss-preset-weapp/rules";
-import {getCertificationInfo, submitCertification} from "~/apis/user";
-import AuthenticationSuccess from "~/pages/real-name-authentication/components/authentication-success.vue";
-import type {CertificationRequest} from "~/apis/model/certification.model";
-
-const front_220714Image = CDN_URL + '/static/assets/front_220714.png'
-const verso_220714Image = CDN_URL + '/static/assets/verso_220714.png'
-
-const userStore = useUserStore()
-
-const formData = reactive({
-  user_name: '',
-  user_card: '',
-  mobile: '',
-  card_positive: '',
-  card_reverse: '',
-})
-
-const state = reactive({
-  isLoading: false,
-  isFormValidate: false,
-  // 审核中
-  isReview: false,
-  // 已认证
-  isCertified: false,
-  isNoCertified: true,
-  // 审核失败
-  isFail: false
-
-})
-onLoad(async () => {
-  await userStore.getUserInfo()
-  console.log(userStore.userInfo)
-  console.log(userStore.userInfo.is_ertification)
-  if (userStore.userInfo.is_ertification === -1) {
-    state.isNoCertified = true
-  }
-
-  getCertificationInfo(1).then(res => {
-
-    // console.log(res)
-    if (res.uid && res.status === '1') {
-      state.isCertified = true
-
-      formData.user_card = res.user_card.replace(/^(\d{4})\d+(\d{4})$/, '$1********$2')
-      formData.user_name = formatName(res.user_name)
-      formData.card_positive = res.card_positive
-      formData.card_reverse = res.card_reverse
-
-    }
-  }).catch(error => {
-    uni.showToast({
-      title: error,
-      icon: 'none'
-    })
-    uni.hideLoading()
-
-  })
-})
-
-const certificationStatus =  computed(() => {
-  let statusMsg = ''
-  switch (userStore.userInfo.is_ertification) {
-    case 0: {
-      statusMsg = '审核中'
-      break;
-    }
-    case 1: {
-      statusMsg = '已认证'
-      break;
-    }
-    case 2: {
-      statusMsg = '已拒绝，重新提交'
-      break;
-    }
-    default: {
-      statusMsg = '立即认证'
-      break;
-    }
-  }
-  return statusMsg
-})
-
-const headers = {
-  // #ifdef MP
-  "Content-Type": "multipart/form-data",
-  // #endif
-  "X-Token": 'Bearer ' + getToken()
-}
-
-
-function handleUploadImg(type: 'positive' | 'reverse') {
-  if (state.isCertified) {
-    return
-  }
-  uploadImageOne('upload/image', (res) => {
-    if (type === 'positive') {
-      formData.card_positive = res.data.path
-      console.log(formData.card_positive)
-    }
-    if (type === 'reverse') {
-      formData.card_reverse = res.data.path
-      console.log(formData.card_reverse)
-    }
-  })
-}
-function validateForm() {
-
-  if (formData.user_name === '') {
-    uni.showToast({
-      title: '请填写姓名',
-      icon: 'none'
-    })
-    // return isValidate
-    return state.isFormValidate = false
-  }
-  if (!(/^[\u4e00-\u9fa5]{2,4}$/.test(formData.user_name))) {
-    uni.showToast({
-      title: '请正确输入您的姓名',
-      icon: 'none'
-    })
-    return state.isFormValidate = false
-  }
-
-  // if (formData.mobile === '') {
-  //   uni.showToast({
-  //     title: '请填写手机号',
-  //     icon: 'none'
-  //   })
-  //   return state.isFormValidate = false
-  // }
-
-  // if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.mobile)) {
-  //    uni.showToast({
-  //     title: '请填写正确的手机号',
-  //     icon: 'none'
-  //   })
-  //   return state.isFormValidate = false
-  //
-  // }
-
-  if (formData.user_card === '') {
-     uni.showToast({
-      title: '请填写身份证号',
-      icon: 'none'
-    })
-    return state.isFormValidate = false
-
-  }
-
-  if (!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X|x)$/.test(formData.user_card)) {
-    uni.showToast({
-      title: "请填写正确身份证号",
-      icon: "none"
-    });
-    return state.isFormValidate = false
-
-  }
-
-  if (formData.card_positive === '') {
-    uni.showToast({
-      title: '请上传身份证人像面图',
-      icon: 'none'
-    })
-    return state.isFormValidate = false
-
-  }
-  if (formData.card_reverse === '') {
-    uni.showToast({
-      title: '请上传身份证国徽面图'
-    })
-    return state.isFormValidate = false
-
-  }
-
-  return state.isFormValidate = true
-}
-function handleSubmit () {
-
-  if (validateForm()) {
-    state.isLoading = true
-    uni.showLoading({
-      title: '认证提交中'
-    })
-    const certificationRequest: CertificationRequest = {
-      user_name: formData.user_name,
-      user_card: formData.user_card,
-      mobile: userStore.userInfo.phone,
-      card_positive: formData.card_positive,
-      card_reverse: formData.card_reverse
-    }
-	console.log("===certificationRequest",certificationRequest);
-    submitCertification(certificationRequest).then(res => {
-      // state.isLoading = false
-      uni.hideLoading()
-      // formData = {}
-      if (res && res.user_card && res.user_name) {
-        formData.user_card = res.user_card
-        formData.user_name = res.user_name
+	import { CDN_URL } from "~/config/app";
+	import { UPLOAD_URL } from "~/utils/http";
+	import { getToken } from "~/utils/auth";
+	import { uploadImageOne } from "~/utils/upload";
+	import { backdropFilterBase } from "unocss-preset-weapp/rules";
+	import { getCertificationInfo, submitCertification } from "~/apis/user";
+	import AuthenticationSuccess from "~/pages/real-name-authentication/components/authentication-success.vue";
+	import type { CertificationRequest } from "~/apis/model/certification.model";
+
+	const front_220714Image = CDN_URL + '/static/assets/front_220714.png'
+	const verso_220714Image = CDN_URL + '/static/assets/verso_220714.png'
+
+	const userStore = useUserStore()
+	const userInfoX =ref({})
+
+	const formData = reactive({
+		user_name: '',
+		user_card: '',
+		mobile: '',
+		card_positive: '',
+		card_reverse: '',
+	})
+
+	const state = reactive({
+		isLoading: false,
+		isFormValidate: false,
+		// 审核中
+		isReview: false,
+		// 已认证
+		isCertified: false,
+		isNoCertified: true,
+		// 审核失败
+		isFail: false
+
+	})
+	onLoad(async () => {
+		await userStore.getUserInfo()
+		console.log(userStore.userInfo)
+		console.log(userStore.userInfo.is_ertification)
+		if (userStore.userInfo.is_ertification == -1) {
+			state.isNoCertified = true
+		}
+
+		getCertificationInfo(1).then(res => {
+
+			if (res.uid && res.status == '1') {
+				state.isCertified = true
+				formData.user_card = res.user_card.replace(/^(\d{4})\d+(\d{4})$/, '$1********$2')
+				formData.user_name = formatName(res.user_name)
+				formData.card_positive = res.card_positive
+				formData.card_reverse = res.card_reverse
+				userInfoX.value = res
+			}
+			userInfoX.value = res
+		}).catch(error => {
+			uni.showToast({
+				title: error,
+				icon: 'none'
+			})
+			uni.hideLoading()
+
+		})
+	})
+
+	const certificationStatus = computed(() => {
+		let statusMsg = ''
+		switch (userStore.userInfo.is_ertification) {
+			case 0: {
+				statusMsg = '审核中'
+				break;
+			}
+			case 1: {
+				statusMsg = '已认证'
+				break;
+			}
+			case 2: {
+				statusMsg = '已拒绝，重新提交'
+				break;
+			}
+			default: {
+				statusMsg = '立即认证'
+				break;
+			}
+		}
+		return statusMsg
+	})
+
+	const headers = {
+		// #ifdef MP
+		"Content-Type": "multipart/form-data",
+		// #endif
+		"X-Token": 'Bearer ' + getToken()
+	}
+
+
+	function handleUploadImg(type : 'positive' | 'reverse') {
+		if (state.isCertified) {
+			return
+		}
+		uploadImageOne('upload/image', (res) => {
+			if (type === 'positive') {
+				formData.card_positive = res.data.path
+				console.log(formData.card_positive)
+			}
+			if (type === 'reverse') {
+				formData.card_reverse = res.data.path
+				console.log(formData.card_reverse)
+			}
+		})
+	}
+	function validateForm() {
+
+		if (formData.user_name === '') {
+			uni.showToast({
+				title: '请填写姓名',
+				icon: 'none'
+			})
+			// return isValidate
+			return state.isFormValidate = false
+		}
+		if (!(/^[\u4e00-\u9fa5]{2,4}$/.test(formData.user_name))) {
+			uni.showToast({
+				title: '请正确输入您的姓名',
+				icon: 'none'
+			})
+			return state.isFormValidate = false
+		}
+
+		
+
+		if (formData.user_card === '') {
+			uni.showToast({
+				title: '请填写身份证号',
+				icon: 'none'
+			})
+			return state.isFormValidate = false
+
+		}
+
+		if (!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X|x)$/.test(formData.user_card)) {
+			uni.showToast({
+				title: "请填写正确身份证号",
+				icon: "none"
+			});
+			return state.isFormValidate = false
+
+		}
+
+		if (formData.card_positive === '') {
+			uni.showToast({
+				title: '请上传身份证人像面图',
+				icon: 'none'
+			})
+			return state.isFormValidate = false
+
+		}
+		if (formData.card_reverse === '') {
+			uni.showToast({
+				title: '请上传身份证国徽面图'
+			})
+			return state.isFormValidate = false
+
+		}
+
+		return state.isFormValidate = true
+	}
+	function handleSubmit() {
+
+		if (validateForm()) {
+			state.isLoading = true
+			uni.showLoading({
+				title: '认证提交中'
+			})
+			const certificationRequest : CertificationRequest = {
+				user_name: formData.user_name,
+				user_card: formData.user_card,
+				mobile: userStore.userInfo.phone,
+				card_positive: formData.card_positive,
+				card_reverse: formData.card_reverse
+			}
+			console.log("===certificationRequest", certificationRequest);
+			submitCertification(certificationRequest).then(res => {
+				// state.isLoading = false
+				uni.hideLoading()
+				// formData = {}
+				if (res && res.user_card && res.user_name) {
+					formData.user_card = res.user_card
+					formData.user_name = res.user_name
+					formData.card_positive = formData.card_positive
+					formData.card_reverse = formData.card_reverse
+				}
+				state.isLoading = false
+				state.isCertified = true
+
+				userStore.getUserInfo()
+
+
+			}).catch(error => {
+				uni.showToast({
+					title: error,
+					icon: 'none'
+				})
+				state.isLoading = false
+			})
+		} else {
+			return false
+		}
+	}
+	function formatName(str) {
+		return new Array(str.length).join('*') + str.substr(-1);
+
+	}
+
+	function onBackClick() {
+		uni.navigateBack()
+	}
+
+	function onReSetClick() {
+		state.isCertified = false
+		formData.user_card =userInfoX.value.user_card
+		formData.user_name = userInfoX.value.user_name
 		formData.card_positive = formData.card_positive
 		formData.card_reverse = formData.card_reverse
-      }
-      state.isLoading = false
-	  state.isCertified = true
-	  
-	  userStore.getUserInfo()
-	  
-	  
-    }).catch(error => {
-      uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-      state.isLoading = false
-    })
-  } else {
-    return false
-  }
-}
-function formatName (str) {
-  return new Array(str.length).join('*') + str.substr(-1);
-
-}
+	}
 </script>
 
 <template>
-  <AuthenticationSuccess v-if="state.isCertified"/>
-
-  <div  v-if="!state.isCertified" class="flex flex-col pt-3 gap-3 pb-safe text-sm">
-    <div class="bg-white flex flex-col  px-3">
-      <div class="f-hairline-bottom py-3 flex">
-        <div>真实姓名：</div>
-        <input v-model="formData.user_name"
-               :disabled="state.isCertified"
-               placeholder="请输入真实姓名"
-               class="text-sm"
-               :class="state.isCertified && 'text-gray'"
-        />
-      </div>
-
-      <div class="f-hairline-bottom py-3 flex">
-        <div>证件号码：</div>
-        <input v-model="formData.user_card"
-               :disabled="state.isCertified"
-               placeholder="请输入证件号码" class="text-sm"
-               :class="state.isCertified && 'text-gray'"
-        />
-      </div>
-
-    </div>
-
-    <div class="bg-white flex flex-col  p-3 gap-3">
-      <div class="flex flex-col gap-3 ">
-        <div>身份证人像面图：</div>
-        <div class="flex justify-center items-center">
-
-          <image  v-if="formData.card_positive && !state.isCertified"
-                  :src="formData.card_positive"
-                  @tap="handleUploadImg('positive')"
-                  mode="scaleToFill" class="w-60 h-40"></image>
-          <image v-else
-                 :src="front_220714Image"
-                 @tap="handleUploadImg('positive')"
-                 mode="aspectFit" class="w-60 h-40"></image>
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-3 ">
-        <div>身份证国徽面图：</div>
-        <div class="flex justify-center items-center">
-<!--          <image :src="verso_220714Image" mode="widthFix" class="w-60"></image>-->
-
-          <image  v-if="formData.card_reverse && !state.isCertified"
-                  :src="formData.card_reverse"
-                  @tap="handleUploadImg('reverse')"
-                  mode="scaleToFill" class="w-60 h-40 "></image>
-          <image v-else
-                 :src="verso_220714Image"
-                 @tap="handleUploadImg('reverse')"
-                 mode="widthFix" class="w-60"></image>
-        </div>
-      </div>
-    </div>
-
-  </div>
-  <div class="fixed bottom-0 p-safe bg-white w-full" v-if="!state.isCertified">
-    <div class=" px-3">
-      <nut-button
-          @tap="handleSubmit"
-          :loading="state.isLoading"
-          type="primary" block>确认提交</nut-button>
-    </div>
-  </div>
+	
+	<view class="user-info-content">
+		<AuthenticationSuccess v-if="state.isCertified" :formData='formData' />
+		
+		<div class="flex flex-col pt-3 gap-3  text-sm">
+			<div class="bg-white flex flex-col  px-3">
+				<div class="f-hairline-bottom py-3 flex">
+					<div>真实姓名：</div>
+					<input v-model="formData.user_name" :disabled="state.isCertified" placeholder="请输入真实姓名" class="text-sm"
+						:class="state.isCertified && 'text-gray'" />
+				</div>
+		
+				<div class="f-hairline-bottom py-3 flex">
+					<div>证件号码：</div>
+					<input v-model="formData.user_card" :disabled="state.isCertified" placeholder="请输入证件号码" class="text-sm"
+						:class="state.isCertified && 'text-gray'" />
+				</div>
+		
+			</div>
+		
+			<div class="bg-white flex flex-col  p-3 gap-3" v-if="!state.isCertified">
+				<div class="flex flex-col gap-3 ">
+					<div>身份证人像面图：</div>
+					<div class="flex justify-center items-center">
+		
+						<image v-if="formData.card_positive" :src="formData.card_positive"
+							@tap="handleUploadImg('positive')" mode="scaleToFill" class="w-60 h-40"></image>
+						<image v-else :src="front_220714Image" @tap="handleUploadImg('positive')" mode="aspectFit"
+							class="w-60 h-40"></image>
+					</div>
+				</div>
+		
+				<div class="flex flex-col gap-3 ">
+					<div>身份证国徽面图：</div>
+					<div class="flex justify-center items-center">
+						<image v-if="formData.card_reverse" :src="formData.card_reverse" @tap="handleUploadImg('reverse')"
+							mode="scaleToFill" class="w-60 h-40 "></image>
+						<image v-else :src="verso_220714Image" @tap="handleUploadImg('reverse')" mode="widthFix"
+							class="w-60"></image>
+					</div>
+				</div>
+			</div>
+		
+		</div>
+		<div class="fixed bottom-0 p-safe bg-white w-full" v-if="!state.isCertified">
+			<div class=" px-3">
+				<nut-button @tap="handleSubmit" :loading="state.isLoading" type="primary" block>确认提交</nut-button>
+			</div>
+		</div>
+		
+		<view v-else class="bottom-btn-content ">
+			<view class="left-btn" @click="onReSetClick">修改实名信息</view>
+			<view class="right-btn" @click="onBackClick">返回</view>
+		</view>
+	</view>
+	
+
+
 </template>
 
 <style>
-page {
-  background: #f8f8f8;
-  overflow: hidden;
-}
-
-.wx-radio-input {
-  height: 16px !important;
-  width: 16px !important;
-}
+	
+	.wx-radio-input {
+		height: 16px !important;
+		width: 16px !important;
+	}
 </style>
+
+<style scoped lang="scss">
+	.user-info-content{
+		display: flex;
+		background: #f8f8f8;
+		min-height: 100vh;
+		flex-direction: column;
+	}
+	.bottom-btn-content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 30rpx;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+
+		.left-btn {
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			background-color: #fff;
+			flex: 1;
+			border: #333 1rpx solid;
+			border-radius: 80rpx;
+			height: 80rpx;
+			font-size: 28rpx;
+			margin-left: 20rpx;
+			margin-left: 20rpx;
+			color: #333;
+		}
+
+		.right-btn {
+			margin-left: 20rpx;
+			margin-left: 20rpx;
+			display: flex;
+			justify-content: center;
+			flex-direction: row;
+			align-items: center;
+			flex: 1;
+			border-radius: 80rpx;
+			height: 80rpx;
+			background-color: #ff0000;
+			color: #fff;
+			font-size: 28rpx;
+
+		}
+	}
+</style>
+
 <route lang="yaml">
 style:
   navigationBarTitleText: 实名认证

src/pages/third_party_binding/index.vue

@@ -3,6 +3,9 @@ import {CDN_URL} from "~/config/app";
 import {getBindingState, getUserUnionId, wechatCheck,apiUnbindAccount} from "~/apis/user";
 import {findLast, union} from "lodash-es";
 import {getUpdateAccount} from "~/apis/auth.api";
+import {UPLOAD_URL} from "~/utils/http";
+import {getToken} from "~/utils/auth";
+import { uploadImageOne } from "~/utils/upload";
 
 const zfbImage = CDN_URL + '/static/assets/zfb_sf_220908.png'
 const wxImage = CDN_URL + '/static/assets/wx_sf_220908.png'
@@ -11,6 +14,9 @@ const bindState = ref([])
 import {useUserStore} from "~/stores/userStore";
 const userList=ref([])
 const userStore = useUserStore()
+const userNick=ref('点击获取微信昵称')
+const userHead=ref('')
+const ylj_fh_220914Image = `${CDN_URL}/static/assets/ylj_fh_220914.png`
 
 
 onLoad(() => {
@@ -46,6 +52,7 @@ function updateAccount(type, info: {unionId: string, nickName: string, avatarUrl
     title: '授权中',
     icon: 'none'
   })
+  
   getUpdateAccount({
     type,
     openid: info.unionId,
@@ -89,32 +96,129 @@ function unbindAccount(){
 
 function getUserInfo() {
   if (!getBindState('1')) {
-    uni.login({
-      provider: 'weixin',
-      univerifyStyle: {
-        fullScreen: true
-      },
-      success: (result) => {
-        getUserUnionId({
-          code: result.code,
-          source: 'cxb'
-        }).then(unionRes => {
-          updateAccount(1, {
-            unionId: unionRes.unionid,
-            nickName: userStore.userInfo.nickname,
-            avatarUrl: userStore.userInfo.avatar
-          })
-        })
-      },
-      fail: (error) => {
-        console.log(error)
-      }
-    });
+	
+	  uni.getUserProfile({
+	  	desc:'用于完善个人资料',
+	  		success: (res) => {
+	  		    const { avatarUrl, nickName } = res.userInfo;
+	  		    console.log("===avatarUrl",avatarUrl);
+	  			console.log("===avatarUrl",nickName);
+				
+				uni.login({
+				  provider: 'weixin',
+				  univerifyStyle: {
+				    fullScreen: true
+				  },
+				  success: (result) => {
+				    getUserUnionId({
+				      code: result.code,
+				      source: 'cxb'
+				    }).then(unionRes => {
+				      updateAccount(1, {
+				        unionId: unionRes.unionid,
+				        nickName: nickName,
+				        avatarUrl: avatarUrl
+				      })
+				    })
+				  },
+				  fail: (error) => {
+				    console.log(error)
+				  }
+				});
+	  		  }
+	  })
+	  
   }else{
-	  unbindAccount()
+	  uni.showModal({
+	  	title:'温馨提示',
+		content:'请您确认是否解除授权！',
+		complete: (res) => {
+			if(res.confirm){
+				 unbindAccount()
+			}
+		}
+	  })
+	 
   }
 }
+function getUserProfile({detail}){
+  
+  const inputName = 'field';
 
+  uni.uploadFile({
+    url: UPLOAD_URL,
+    name: 'field',
+    formData: {
+      'filename': inputName
+    },
+    header: {
+      // #ifdef MP
+      "Content-Type": "multipart/form-data",
+      // #endif
+      'X-Token':'Bearer ' + getToken()
+      // [TOKENNAME]: 'Bearer ' + store.state.app.token
+    },
+    filePath: detail.avatarUrl ,
+    success: res => {
+		
+		console.log("===res");
+      uni.hideLoading()
+      const { data } = res
+      const assetData = JSON.parse(data)
+      if (assetData && assetData.data) {
+        userHead.value = assetData.data.path
+      }
+    },
+	fail: (res) => {
+		console.log("---res",res);
+	}
+  })
+}
+
+function onBindClick(){
+	
+	if(getBindState('1')){
+		unbindAccount()
+		return
+	}
+	if(!userHead.value){
+		uni.showToast({
+			title:'请点击获取微信头像',
+			icon:'none'
+		})
+		return
+	}
+	
+	if(!userNick.value){
+		uni.showToast({
+			title:'请点击获取微信昵称',
+			icon:'none'
+		})
+		return
+	}
+	
+	uni.login({
+	  provider: 'weixin',
+	  univerifyStyle: {
+	    fullScreen: true
+	  },
+	  success: (result) => {
+	    getUserUnionId({
+	      code: result.code,
+	      source: 'cxb'
+	    }).then(unionRes => {
+	      updateAccount(1, {
+	        unionId: unionRes.unionid,
+	        nickName: userNick.value,
+	        avatarUrl: userHead.value
+	      })
+	    })
+	  },
+	  fail: (error) => {
+	    console.log(error)
+	  }
+	});
+}
 
 </script>
 <template>
@@ -128,57 +232,123 @@ function getUserInfo() {
           微信授权
         </div>
       </div>
-      <div class="border border-solid rounded-full  text-xs px-2 h-4"
-           @tap="getUserInfo"
+      <button class="border border-solid rounded-full  text-xs px-2 h-6"
            :class="getBindState('1') ? 'text-red' : 'text-gray border-gray'"
       >
-        {{ getBindState('1') ? '解除授权' : '去授权' }}
-      </div>
+        {{ getBindState('1') ? '已授权' : '未授权' }}
+      </button>
 	
     </div>
 	<view class="item-line"></view>
 	
-	<view class="flex flex-col" v-for="(item,index) in bindState">
-		<view class="user-info-content">
+	
+	<view class="add-item" v-if=" !getBindState('1')">
+		 <button class="add-button-item" open-type="chooseAvatar" @chooseavatar="getUserProfile" >点击获取微信头像</button>
+		 <image class="user-head" :src="userHead" mode="widthFix"></image>
+		  <image class="user-arrow" :src="ylj_fh_220914Image" mode="widthFix"></image>
+	</view>
+	<view class="item-line" v-if=" !getBindState('1')"></view>
+	<view class="add-item" v-if=" !getBindState('1')">
+		<input placeholder-class="add-button-item"  class="add-button-item" type="nickname"   v-model="userNick"  placeholder="获取微信昵称" />
+		 <image class="user-arrow" :src="ylj_fh_220914Image" mode="widthFix"></image>
+	</view>
+	
+	<view :key="'bind-user-item-'+index" class="flex flex-col " v-for="(item,index) in bindState">
+		<view class="user-info-content" v-if="item.type==1">
 				  <image class="user-icon" :src="item.avater?item.avater:defaultHeadImg" mode="aspectFill"></image>
 				  <text class="user-nick-name">{{item.nickname}}</text>
-				  <!-- <view class="un-bind-btn" @click="unbindAccount">解除绑定</view> -->
 		</view>
 		<view v-if="index !=userList.length-1" class="item-line"></view>
 	</view>
 	</view>
+	<view class="bottom-btn" @click="onBindClick">  {{ getBindState('1') ? '解除绑定' : '授权绑定' }}</view>
   </div>
-  <!--
-  <div class="flex flex-row  justify-between bg-white p-4">
-    <div class="flex-1 flex text-sm items-center gap-2">
-      <image :src="zfbImage" mode="widthFix" class="w-4 h-4"></image>
-      <div>
-        支付宝授权
-      </div>
-    </div>
-    <div class="border border-solid rounded-full  text-xs px-2 h-4"
-         :class="getBindState('2') ? 'text-red' : 'text-gray border-gray'"
-    >
-      {{ getBindState('2') ? '已授权' : '未授权' }}
-
-    </div>
-  </div>
-  -->
+ 
 </template>
 
 <style>
 page {
   background: #f8f8f8;
 }
+button{
+		margin: 0;
+		padding: 0;
+		outline: none;
+		border-radius: 0;
+		background-color: transparent;
+		line-height: inherit;
+	}
+	button::after{
+		border: none;
+	}
+
 </style>
 
 
 <style scoped lang="scss">
 	
+	.bottom-btn{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		height: 80rpx;
+		align-items: center;
+		color: #fff;
+		font-size: 28rpx;
+		justify-content: center;
+		background-color: #ff0000;
+		margin-top: 30rpx;
+		margin-left: 40rpx;
+		margin-right: 40rpx;
+		border-radius: 80rpx;
+	}
+	
+	
 	.user-info-out-content{
 		display: flex;
 		flex-direction: column;
 		background-color: #fff;
+		box-sizing: border-box;
+		
+		
+		.add-item{
+			border-radius: 20rpx;
+			height: 80rpx;
+			margin-bottom: 20rpx;
+			margin-top: 20rpx;
+			margin-left: 40rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-right: 40rpx;
+			font-size: 28rpx;
+			color: #333;
+		}
+		
+		
+		.add-button-item{
+			height: 80rpx;
+			display: flex;
+			border:none;
+			flex-direction: row;
+			flex: 1;
+			align-items: center;
+			font-size: 28rpx;
+			color: #333;
+			background-color: #fff;
+		}
+		.user-head{
+			width: 70rpx;
+			border-radius: 50%;
+			height: 70rpx;
+			background-color: #eeeeee;
+		}
+		
+		.user-arrow{
+			width: 20rpx;
+			margin-left: 10rpx;
+			height: 30rpx;
+		}
 		
 		.item-line{
 			margin-left: 40rpx;

src/pages/user/index.vue

@@ -548,16 +548,17 @@
 						<view class=" sign-content">
 
 							<!-- 用户 -->
+							<image v-if="userInfo?.originator_id_old" mode="widthFix" lazy-load class="sign-icon" src="/static/icon/user_xx_icon.png" />
 							<image v-if="userType" mode="widthFix" lazy-load class="sign-icon" :src="userType" />
 
 							<!-- 市区县代理 -->
 							<!-- <view v-if="areaType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit "
 							@click="openPopup">
 							<image mode="heightFix" lazy-load class="sign-icon" :src="areaType" />
-						</view>
-						 -->
+						</view> -->
+						
 							<!-- 股东 -->
-							<!-- 	<view v-if="AlholderType"
+								<!-- <view v-if="AlholderType"
 							class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
 							<image mode="heightFix" lazy-load class="sign-icon" :src="AlholderType" />
 						</view> -->

src/pages/user/login/index.vue

@@ -73,7 +73,7 @@ async function handleWexinLogin() {
         let redirectPageObj: { page: string; type: 'page' | 'tab' }
         if (Cache.get('SHARE_REDIRECT_PAGE'))
           redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
-        wechatCheck(unionRes.openid).then((checkRes) => {
+        wechatCheck(unionRes.unionid).then((checkRes) => {
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)

src/subPages/pages/bankDetail/index.vue

@@ -34,8 +34,8 @@
 
 <script setup>
 	import {
-		apiGetTrVrInfo,
-		apiBankCreate
+		apiBankCreate,
+		getCertificationInfo
 	} from '~/apis/user'
 	import {formatDate} from '~/utils/util'
 	
@@ -53,11 +53,20 @@
 	})
 	onLoad((option) => {
 		if(option.item!= 'null'){
-			console.log("===option.item",option.item);
 			cardInfo.value =JSON.parse(option.item)
+			getCertificationInfoX()
+		}else {
+			getCertificationInfoX()
 		}
 	})
 	
+	function getCertificationInfoX(){
+		getCertificationInfo(1).then(res=>{
+			cardInfo.value.user_name =res.user_name
+			cardInfo.value.user_card =res.user_card
+		})
+	}
+	
 	function onSubmitClick(){
 		if(!cardInfo.value.user_name){
 			uni.showToast({
@@ -113,16 +122,7 @@
 	}
 	
 
-	function getList(){
-		uni.showLoading({
-			title:'加载中...'
-		})
-	    apiGetTrVrInfo({page:state.page}).then(res => {
-			count.value = res.count
-	    	dataList.value= res.list
-			uni.hideLoading()
-	    })
-	}
+	
 	
 </script>
 <route lang="yaml">

src/subPages/pages/immediate-withdrawal/index.vue

@@ -42,6 +42,7 @@ const bankIndex=ref(0)
 const showPhonePop=ref(false)
 const userHBInfo=ref({})
 const bankList=ref([])
+const initType =ref(0)
 
 const userQbPrice=ref(0)
 // userSpreadInfo.value.brokerage_price
@@ -54,6 +55,7 @@ onLoad((options) => {
     } else if (options.type == 3) {
       isshow.value = 3
     }
+	
 	console.log("===options.type",options.type);
   }
 })
@@ -204,6 +206,8 @@ function handleImmediateWithdrawal() {
   if (isDisabled.value) {
     return
   }
+  
+
   if(bankList.value && bankList.value.length==0){
 	  uni.showToast({
 	    title: '请绑定提现银行卡',
@@ -313,6 +317,7 @@ function handleImmediateredWithdrawal() {
   if (isDisabled.value) {
     return
   }
+
   if (widthdrawalConfig.value.withdrawal_status == '0') {
     isDisabled.value = true
     return uni.showToast({
@@ -372,7 +377,7 @@ function handleImmediateredWithdrawal() {
 
 function handleWithdrawalRecord() {
   uni.navigateTo({
-    url: '/subPages/pages/withdrawal-record/index'
+    url: `/subPages/pages/withdrawal-record/index?type=${isshow.value}`
   })
 }
 
@@ -391,7 +396,7 @@ function onBankItemClick(item:any){
 		url:`/subPages/pages/bankDetail/index?item=${JSON.stringify(item)}`
 	})
 }
-const userCode =ref()
+const userCode =ref('')
 const btnName=ref('重新获取')
 
 function onBtnClick(){
@@ -425,11 +430,14 @@ function sendCode(){
 function onCancelClick(){
 	clearInterval(time.value)
 	showPhonePop.value=false
+	userCode.value=''
 }
 
+
+
 function onSubmitClick(){
 	clearInterval(time.value)
-	onCancelClick()
+	showPhonePop.value=false
 	uni.showLoading({
 		title:'请求中'
 	})
@@ -437,12 +445,13 @@ function onSubmitClick(){
 		sms_code:userCode.value.replace(/\s/g, ""),
 		extract_price:cashWithdrawalAmount.value,
 		bank_id:bankList.value[bankIndex.value].id,
-		extract_type:3
+		extract_type:3,
+		type: isshow.value
 	}
 	apiExtractCreate(params).then(res=>{
 		uni.hideLoading()
 		uni.navigateTo({
-		   url: '/subPages/pages/withdrawal-record/index'
+		   url:`/subPages/pages/withdrawal-record/index?type=${isshow.value}`
 		})
 	})
 }

src/subPages/pages/mine-top/brokerage.vue

@@ -137,9 +137,11 @@
 			return
 		}
 		apiTransitionVr(num).then(res=>{
-			if(res==200){
-				getInfo()
-			}
+			uni.showToast({
+				title:'转VR成功',
+				icon:'none'
+			})
+			getInfo()
 		}).catch(res=>{
 			uni.showToast({
 				title:res,

src/subPages/pages/mine-top/contribute.vue

@@ -43,7 +43,7 @@
 						<text class="top-title">{{item.mark}}</text>
 						<text class="top-right">{{item.number}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>

src/subPages/pages/mine-top/jifen.vue

@@ -32,7 +32,7 @@
 						<text
 							class="top-right">{{item.reward_socre}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>

src/subPages/pages/mine-top/jingdou.vue

@@ -30,7 +30,7 @@
 						<text class="top-title">{{item.mark}}</text>
 						<text class="top-right">{{item.number}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>

src/subPages/pages/mine-top/qianbao.vue

@@ -30,7 +30,7 @@
 						<text class="top-title">{{item.mark}}</text>
 						<text class="top-right">{{item.number}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>
@@ -66,6 +66,8 @@
 		name: '入账红包'
 	}, {
 		name: '出账红包'
+	}, {
+		name: '未生效红包'
 	}])
 	const userStore = useUserStore()
 	const dataInfo = ref({})
@@ -86,6 +88,12 @@
 		getInfo()
 		getList()
 	})
+	
+	onShow(()=>{
+		state.page = 1
+		getInfo()
+		getList()
+	})
 
 	function onItemClick(index) {
 		if (index == 0) {
@@ -93,8 +101,8 @@
 		} else if (index == 1) {
 			uni.showModal({
 				editable: true,
-				title: '请输入佣金转VR数量',
-				placeholderText: '请输入佣金转VR数量',
+				title: '请输入红包转VR数量',
+				placeholderText: '请输入红包转VR数量',
 				complete: (e) => {
 					if (e.confirm) { //去转换
 						transitionVr(e.content)
@@ -112,10 +120,14 @@
 			})
 			return
 		}
-		apiTransitionVr(num).then(res => {
-			if (res == 200) {
-				getInfo()
-			}
+		apiTransitionVr(num,'hongbao').then(res => {
+			uni.showToast({
+				title:"转VR成功",
+				icon:'none'
+			})
+			getInfo()
+			state.page = 1
+			getList()
 		}).catch(res => {
 			uni.showToast({
 				title: res,
@@ -180,23 +192,7 @@
 		})
 	}
 
-	// onShareAppMessage(() => {
-	// 	const shareId = Cache.get('SHARE_ID')
-	// 	return {
-	// 		title: SHARE_TITLE,
-	// 		path: `/pages/vip/index?shareId=${shareId}`,
-	// 		imageUrl: SHARE_BANNER
-	// 	}
-	// })
-
-	// onShareTimeline(() => {
-	// 	const shareId = Cache.get('SHARE_ID')
-	// 	return {
-	// 		title: SHARE_TITLE,
-	// 		query: `from=share&shareId=${shareId}`,
-	// 		imageUrl: SHARE_ICON
-	// 	}
-	// })
+
 
 	onReachBottom(() => {
 		console.log('到底了。。。')
@@ -206,8 +202,8 @@
 
 	onPullDownRefresh(() => {
 		state.page = 1
-		getList()
 		uni.stopPullDownRefresh()
+		getList()
 	})
 
 	function onTabClick(position, id) {

src/subPages/pages/mine-top/repurchase.vue

@@ -29,7 +29,7 @@
 						<text class="top-title">{{item.mark}}</text>
 						<text class="top-right">{{item.number}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>

src/subPages/pages/mine-top/vr.vue

@@ -28,7 +28,7 @@
 						<text class="top-title">{{item.mark}}</text>
 						<text class="top-right">{{item.number}}</text>
 					</view>
-					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
+					<text class="date">{{formatDate(item.addtime,4,'-')}}</text>
 				</view>
 			</view>
 		</view>
@@ -74,14 +74,17 @@
 		getProductShare().then(res => {
 		  if (res) userStore.setShareId(res.share_id)
 		})
+	})
+	
+	
+	onShow(()=>{
+		state.page = 1
 		getInfo()
 		getList()
 		getInfoName()
 	})
 	
-	
 	function onItemClick(){
-		console.log("===dataNameInfo",dataNameInfo.value);
 		let info ={
 			url:dataNameInfo.value.url,
 			name:dataNameInfo.value.name
@@ -108,7 +111,7 @@
 			title: '加载中...',
 			mask: true
 		})
-			apiGetVRList({page:state.page,pm:state.pm}).then(res => {
+			apiGetVRList({page:state.page,pm:state.pm==1?2:0}).then(res => {
 				if (state.page === 1) {
 					listInfo.value = res
 				} else {
@@ -119,23 +122,7 @@
 		})
 	}
 
-	// onShareAppMessage(() => {
-	// 	const shareId = Cache.get('SHARE_ID')
-	// 	return {
-	// 		title: SHARE_TITLE,
-	// 		path: `/pages/vip/index?shareId=${shareId}`,
-	// 		imageUrl: SHARE_BANNER
-	// 	}
-	// })
-
-	// onShareTimeline(() => {
-	// 	const shareId = Cache.get('SHARE_ID')
-	// 	return {
-	// 		title: SHARE_TITLE,
-	// 		query: `from=share&shareId=${shareId}`,
-	// 		imageUrl: SHARE_ICON
-	// 	}
-	// })
+	
 
 	onReachBottom(() => {
 		console.log('到底了。。。')

src/subPages/pages/order/logistics.vue

@@ -234,7 +234,7 @@ function transformStatus() {
       </div>
     </div>
     <!-- 商品推荐 -->
-    <div>
+   <!-- <div>
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
@@ -260,7 +260,7 @@ function transformStatus() {
         </div>
       </div>
 
-    </div>
+    </div> -->
 
   </div>
 </template>

src/subPages/pages/quick-fuc/business.vue

@@ -149,10 +149,10 @@
 	
 
 	function onFucClick(position) {
-
-		if (position == 0 || position == 3) {
-
-			if (uni.getStorageSync('UID')) {
+		
+		if (uni.getStorageSync('UID')) {
+			
+			if(position == 0 || position == 3){
 				let _token = userTokenInfo.value
 				let params = {
 					x_token: _token.mweb_info.x_token,
@@ -167,7 +167,7 @@
 						mer_id: _token.mweb_info.user.mer_id,
 					}
 				}
-
+				
 				let url = `${BASE_URL}/mweb/#/?data=${encodeURIComponent(JSON.stringify(params))}`
 				let info = {
 					url: url,
@@ -176,29 +176,42 @@
 				uni.navigateTo({
 					url: `/subPages/pages/mine-top/common-webView?info=${encodeURIComponent(JSON.stringify(info))}`
 				})
+			}else if(position == 2){
+				uni.openCustomerServiceChat({
+					extInfo: {
+						url: 'https://work.weixin.qq.com/kfid/kfcb5641d3744471601',
+					},
+					corpId: 'wwaeb55681929a37ae',
+					success: (res) => {
+						console.log(res)
+					},
+					fail: (res) => {
+						console.log(res)
+					},
+				})
 			}else {
 				uni.showToast({
-					title:'请登录！',
-					icon:'none'
+					title: '升级中',
+					icon: 'none'
 				})
-				setTimeout(()=>{
-					pageStore.setPageConfig({
-						currentPage: {
-							type: 'tab',
-							url: '/pages/home/index'
-						}
-					})
-					return uni.redirectTo({
-						url: '/pages/user/login/index'
-					})
-				},300)
-			
 			}
-		} else {
+			
+		}else {
 			uni.showToast({
-				title: '升级中',
-				icon: 'none'
+				title:'请登录！',
+				icon:'none'
 			})
+			setTimeout(()=>{
+				pageStore.setPageConfig({
+					currentPage: {
+						type: 'tab',
+						url: '/pages/home/index'
+					}
+				})
+				return uni.redirectTo({
+					url: '/pages/user/login/index'
+				})
+			},300)
 		}
 
 	}

src/subPages/pages/store/product/detail.vue

@@ -982,7 +982,7 @@
 			</div>
 
 		</div>
-
+<!-- 
 		<div class="flex flex-col pb-safe gap-3">
 			<div class="p-3 bg-white">
 				<div class="flex flex-1 justify-start items-center ">
@@ -1011,7 +1011,7 @@
 				</div>
 			</div>
 
-		</div>
+		</div> -->
 
 	</div>
 	<!-- 商品下架 -->

src/subPages/pages/store/product/other.vue

@@ -747,7 +747,7 @@ onReachBottom(() => {
           </div>
         </div>
       </div>
-      <div class="flex flex-col pb-safe gap-3">
+     <!-- <div class="flex flex-col pb-safe gap-3">
         <div class="p-3 bg-white">
           <div
             class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block"
@@ -772,7 +772,7 @@ onReachBottom(() => {
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
   </CXBBasePage>
 </template>

src/subPages/pages/withdrawal-record/index.vue

@@ -6,8 +6,11 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import { IMG_CDN_NEW_URL } from "~/config/app";
 const list = ref([])
 onLoad((option) => {
+	
+	let type =option.type
+	
   getWithdrawal({
-    type: 1
+    type: type
   }).then(res => {
     console.log('提现记录')
     console.log(res)