feat 提交初版本

api/hexiao.js

@@ -3,17 +3,22 @@ import {uploadImageToServer} from "../utils/requestAdmin";
 
 
 //返送验证码
-export function getVerificationCode(tel,userType){
+export function getVerificationCode(tel,userType,tenantId){
     return request({
         url: `/miniapp/sendYzm?tel=`+ tel+"&userType="+userType,
         method: 'post',
+        params: {
+            tel,
+            userType:userType,
+            tenantId
+        }
     })
 }
 
 
 
 //登录
-export function login(tel,code,userType,jsCode){
+export function login(tel,code,userType,jsCode,tenantId){
     return request({
         url: `/miniapp/login`,
         method: 'post',
@@ -21,7 +26,8 @@ export function login(tel,code,userType,jsCode){
             phone:tel,
             userType:userType,
             code:code,
-            jsCode
+            jsCode,
+            tenantId
         }
     })
 }

config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
 
-  // baseUrl: 'https://scantest.dnzc.vip',
-  baseUrl: 'http://172.16.7.235:8080/pg',
-  
+  baseUrl: 'https://scanapi.dnzc.vip/',
+  // baseUrl: 'http://192.168.1.157:8080/pg',
+
 
   // 应用信息
   appInfo: {
@@ -26,4 +26,4 @@ module.exports = {
     ]
   },
 
-}
+}

pages/hexiao/jxs/add_order.vue

@@ -169,7 +169,7 @@ export default {
           }
           uni.hideLoading();
 
-          setTimeout(() => uni.reLaunch({url:"/pages/cjx/hexiao/jxs/order"}), 1500);
+          setTimeout(() => uni.reLaunch({url:"/pages/hexiao/jxs/order"}), 1500);
         })
       }else{
         addDealerOrder(finalData).then(res=>{
@@ -178,7 +178,7 @@ export default {
           }
           uni.hideLoading();
 
-          setTimeout(() => uni.reLaunch({url:"/pages/cjx/hexiao/jxs/order"}), 1500);
+          setTimeout(() => uni.reLaunch({url:"/pages/hexiao/jxs/order"}), 1500);
         })
       }
 

pages/hexiao/jxs/hexiao_record.vue

@@ -60,7 +60,12 @@
             <text class="detail-value">{{ record.ywyName }}</text>
           </view>
 
-          <view class="detail-row" v-if="record.status === 2 || record.status === 3">
+
+          <view class="detail-row" v-if="record.status === 1">
+            <text class="detail-label" >业务员提交时间</text>
+            <text class="detail-value">{{ record. applyTime }}</text>
+          </view>
+          <view class="detail-row"  v-if="record.status === 2 || record.status === 3">
             <text class="detail-label">申请时间</text>
             <text class="detail-value">{{ record. dealerApplyTime }}</text>
           </view>
@@ -83,7 +88,7 @@
         </view>
 
         <view class="card-footer" v-if="record.status === 1">
-          <button class="verify-btn" @click="verify(record.id,record.orderNo)">一键核销</button>
+          <button class="verify-btn" @click="verify(record.id,record.orderNo)">一键审核</button>
         </view>
       </view>
 
@@ -108,7 +113,7 @@ export default {
       searchQuery: '',
       tabs: [
         { name: '全部', key: 'all' ,id:-1 },
-        { name: '待核销', key: 'pending',id: 1 },
+        { name: '待审核', key: 'pending',id: 1 },
         { name: '核销中', key: 'verifying', id: 2},
         { name: '已核销', key: 'verified' , id :3},
       ],
@@ -146,7 +151,7 @@ export default {
     },
     getStatusText(status) {
       const statusMap = {
-        1: '待核销',
+        1: '待审核',
         2: '核销中',
         3: '已核销'
       };

pages/login.vue

@@ -20,7 +20,7 @@
  	export default {
  		data() {
  			return {
- 				scanCode: 'a1504595b94ee44e',
+ 				scanCode: '',
  				path: '',
  				status: false
  			}
@@ -101,7 +101,7 @@
  							}
 							uni.redirectTo({
 								url: url // 目标页面路径
-							})		
+							})
  						})
 
  					} else {
@@ -114,4 +114,4 @@
  			}
  		}
  	}
- </script>
+ </script>