:bug: 忘记密码，单据凭证，交易状态，权限入口

src/service/login/forget-password.js

@@ -1,9 +1,14 @@
 import axios from '../../utils/axios'
-import { stringToUrl } from '@/common/js/utils';
+// import { stringToUrl } from '@/common/js/utils';
+
+// 发送验证码
+// export function sentForgetCode(params) {
+//   return axios.post(`/SZWL-SERVER/tMessageCode/sentForgetCode?${stringToUrl(params)}`, params);
+// }
 
 // 发送验证码
 export function sentForgetCode(params) {
-  return axios.post(`/SZWL-SERVER/tMessageCode/sentForgetCode?${stringToUrl(params)}`, params);
+  return axios.get(`/userLogin/sendVerificationCodeMessage?phone=${params.phone}`, params);
 }
 
 // 注册

src/views/buyOrSell/BuyConf.vue

@@ -7,7 +7,6 @@ import { showFailToast, showSuccessToast } from "vant";
 import { useRouter } from 'vue-router'
 
 
-const certificate = ref('') // 单据凭证
 const price = ref(0) // 价格
 const tradeNumber = ref(0) // 股票数量
 // const sellerUserName = ref('')  // 卖家用户名
@@ -78,8 +77,9 @@ const onSubmit = async () => {
 onMounted(() => {
     if (tradeStore.tradeItem) {
         const item = tradeStore.getTradeItem()
-        certificate.value = item.certificate;
         tradeNumber.value = item.tradeNumber;
+        sellerPayeeCode.value = item.sellerPayeeCode;
+        sellerCardNo.value = item.sellerCardNo;
         price.value = item.price;
         orderId.value = item.id;
     }
@@ -103,7 +103,8 @@ onBeforeUnmount(() => {
             <br>
             <!-- 买入数量/单价/总价 -->
             <van-cell-group inset>
-                <van-field v-model="certificate" readonly name="单据凭证" label="单据凭证" placeholder="单据凭证"
+                
+                <van-field v-model="orderId" readonly name="交易单号" label="交易单号" placeholder="交易单号"
                     left-icon="coupon" />
                 <!-- :rules="[{ required: true, message: '单据凭证缺失' }]" -->
                 <van-field v-model="tradeNumber" readonly name="买入数量" label="买入数量" placeholder="买入数量"

src/views/buyOrSell/BuyConfList.vue

@@ -44,6 +44,7 @@ const getList = async () => {
     const { data } = await getBuyConfList(
         Object.assign({}, searchParams)
     );
+    console.log("买入列表 >>>", data.data);
     if (data.code === "00000") {
         if (searchParams.current === 0) {
             buyConfList.value = [];

src/views/buyOrSell/SellConf.vue

@@ -23,6 +23,7 @@ let imgUrl = ref('')
 
 const getImgFunc = async () => {
     const { data } = await getImg(orderId.value)
+    console.log("orderId >>>", orderId.value);
     if (data.code === '00000') {
         imgUrl.value = data.data
     } else {

src/views/buyOrSell/SellConfList.vue

@@ -8,12 +8,13 @@ import dateUtil from "@/utils/dateUtil";
 import { useRouter } from 'vue-router'
 import { useTradeStore } from '@/stores/trade';
 
-// 状态，0未确认，1已确认，2特殊取消
+// 状态，0未确认，1已确认(双方已确认)，2买家已付款（卖家未确认）,3特殊取消
 const showStatusText = (statusVal) => {
     const statusMap = {
-        0: '未确认',
+        0: '买家未付款',
         1: '已确认',
-        2: '特殊取消',
+        2: '待确认',
+        3: '特殊取消',
     }
     return statusMap[statusVal] || '未知状态';
 }
@@ -44,8 +45,8 @@ const getList = async () => {
     const { data } = await getSellConfList(
         Object.assign({}, searchParams)
     );
+    console.log("卖出列表 >>>", data.data);
     if (data.code === "00000") {
-        console.log("打印一下", data.data);
         if (searchParams.current === 0) {
             sellConfList.value = [];
         }
@@ -54,11 +55,8 @@ const getList = async () => {
             data.data
         );
 
-        console.log("sellConfList.value >>", sellConfList.value);
 
         sellConfListTotal.value = data.data.length;
-        console.log("sellConfListTotal.val >>>", sellConfListTotal.value);
-        console.log("data.data.length >>>", data.data.length);
         if (sellConfList.value.length === data.data.length) {
             finished.value = true;
         }
@@ -77,11 +75,11 @@ const showDateTime = (date) => {
 
 // const userStore = useUserStore();
 const tradeStore = useTradeStore();
-// 去付款
+// 去收款
 const toConf = (item) => {
     // userStore.setUserInfo(item);
     tradeStore.setTradeItem(item);
-    router.push({ name: 'buyConf' });
+    router.push({ name: 'sellConf' });
 };
 
 
@@ -136,8 +134,8 @@ onMounted(async () => {
                     <div v-for="item in sellConfList" :key="item.id" class="listItem">
                         <div class="itemBox">
                             <div class="itemRow">
-                                <span class="itemTitle">卖家:&nbsp;</span>{{
-                                    item.seller }}
+                                <span class="itemTitle">买家:&nbsp;</span>{{
+                                    item.buyer }}
                             </div>
                             <div class="itemRow">
                                 <span class="itemTitle">股票价格:&nbsp;</span>{{
@@ -161,9 +159,8 @@ onMounted(async () => {
                                 }}
                             </div>
 
-                            <!-- 这里要改TODO: -->
                             <!-- 未确认，去确认收款 -->
-                            <div v-if="item.status === '0'" class="itemRow"
+                            <div v-if="item.status === '2'" class="itemRow"
                                 style="display: flex; justify-content: flex-end">
                                 <van-button span="5" round type="primary" :style="{
                                     height: '2em',
@@ -178,13 +175,18 @@ onMounted(async () => {
                                 </van-button>
                             </div>
 
+                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#23EF00，特殊取消-紫#5300EF -->
                             <div class="itemRow" style="display: flex; justify-content: flex-end">
+                                <!-- 未付款 -->
+                                <span v-if="item.status === '0'">{{
+                                    showStatusText(item.status)
+                                    }}</span>
                                 <!-- 已确认 -->
-                                <span v-if="item.status === '1'" style="color: #4fc08d">{{
+                                <span v-if="item.status === '1'" style="color: #23EF00">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 特殊取消 -->
-                                <span v-if="item.status === '2'" style="color: #ff0000">{{
+                                <span v-if="item.status === '3'" style="color: #5300EF">{{
                                     showStatusText(item.status)
                                     }}</span>
                             </div>

src/views/taskMessage/TransactionList.vue

@@ -51,18 +51,22 @@
                                     showDateTime(item.sellerConfirmTime)
                                 }}
                             </div>
-
+                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#23EF00，特殊取消-紫#5300EF -->
                             <div class="itemRow" style="display: flex; justify-content: flex-end">
-                                <!-- 未确认 -->
-                                <span v-if="item.status === '0'" style="color: #EA5223">{{
+                                <!-- 未付款 -->
+                                <span v-if="item.status === '0'" style="color: #F90068">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 已确认 -->
-                                <span v-if="item.status === '1'" style="color: #4fc08d">{{
+                                <span v-if="item.status === '1'" style="color: #23EF00">{{
+                                    showStatusText(item.status)
+                                    }}</span>
+                                <!-- 已付款，待卖家确认 -->
+                                <span v-if="item.status === '2'" style="color: #00A2F9">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 特殊取消 -->
-                                <span v-if="item.status === '2'" style="color: #ff0000">{{
+                                <span v-if="item.status === '3'" style="color: #5300EF">{{
                                     showStatusText(item.status)
                                     }}</span>
                             </div>
@@ -84,11 +88,13 @@ import { showFailToast } from "vant";
 import { getLoginUser, styleUrl } from "@/common/js/utils";
 import dateUtil from "@/utils/dateUtil";
 
+// 状态，0未确认，1已确认(双方已确认)，2买家已付款（卖家未确认）,3特殊取消
 const showStatusText = (statusVal) => {
     const statusMap = {
-        0: '未确认',
+        0: '未付款',
         1: '已确认',
-        2: '特殊取消',
+        2: '待确认',
+        3: '特殊取消',
     }
     return statusMap[statusVal] || '未知状态';
 }

src/views/user/UserIndex.vue

@@ -109,7 +109,7 @@
           </div>
 
           <!-- 买家确认付款 -->
-          <div class="taskListRow flex-col" @click="pushPageList('/buyConfList')">
+          <div v-if="!isAdmin" class="taskListRow flex-col" @click="pushPageList('/buyConfList')">
             <div class="taskIcon buyConfIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -119,7 +119,7 @@
           </div>
 
           <!-- 卖家收款确认 -->
-          <div class="taskListRow flex-col" @click="pushPageList('/sellConfList')">
+          <div v-if="!isAdmin" class="taskListRow flex-col" @click="pushPageList('/sellConfList')">
             <div class="taskIcon sellConfIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -406,7 +406,7 @@ export default {
     };
     const isInWeChat = ref(false);
 
-    
+
     // 是否有上级账号
     const haveRelation = ref(false);
     const haveRelationCheck = () => {
@@ -415,7 +415,7 @@ export default {
       }
     }
 
-    
+
 
     onMounted(() => {
       haveRelationCheck();