Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp into dev

2023-12-04 09:17:36 +08:00 · 2023-12-04 09:17:36 +08:00 · 96d2552de2
commit 96d2552de2
parent d18961e965 58986ff80f
9 changed files with 433 additions and 405 deletions
--- a/App.vue
+++ b/App.vue
@ -4,6 +4,7 @@
 	// #endif
 	import {
 		loginShopAccount,
+    loginParseToken,
 		userInfo
 	} from "@/api/oaUser.js"
 	export default {
@ -33,9 +34,13 @@
 				uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP);
 				uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token);
 				try {
-					let res = await loginShopAccount({
-						shop_token: info.referrerInfo?.extraData?.token
-					});
+          let res = await loginParseToken({
+            // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc"
+            token: info.referrerInfo?.extraData?.token
+          })
+					// let res = await loginShopAccount({
+					// 	shop_token: info.referrerInfo?.extraData?.token
+					// });
 					this.$store.commit('SET_USERINFO', {
 						user: {},
 						token: res.data.token
--- a/api/oaUser.js
+++ b/api/oaUser.js
@ -69,3 +69,8 @@ export const destroyAccount = (data) => oahttp.post('/user/destroy_account', dat
 * 商城登录
 */
 export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true })
+
+/**
+ * 中台登录
+ */
+export const loginParseToken = (data) => oahttp.post('/login/parseToken', data, { noAuth: true })
--- a/config/app.js
+++ b/config/app.js
@ -2,7 +2,7 @@ let httpApiThree;
 let httpApi; // 总域名
 let httpApiTwo; // 物流系统域名

-const env = 'local'; // 开发
+const env = 'dev'; // 开发
 // const env = 'prod'; // 生产
 // const env = 'prew';    // 预上线
 // const env = 'local'; // 本地
@ -19,7 +19,6 @@ switch (env) {
 		httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
 		break;
 	case 'local':
-
 		httpApi = 'http://192.168.1.20:8000' //预上线
 		httpApiThree = 'http://192.168.1.20:8000' //预上线
 		httpApiTwo = 'http://192.168.1.20:8000' //预上线
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@ -337,6 +337,8 @@


 			qrqodeFn() {
+				// uni.navigateBack()
+				// return
 				let that = this
 				console.log(6666)
 				uni.scanCode({
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@ -82,7 +82,7 @@
 									<!-- <u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
 										height="100rpx" @click="click"></u--image> -->

-									<text>X{{item.product_num}}{{item.goods_unit}}</text>
+									<text>X{{item.product_num}}</text>
 								</view>
 							</view>
 						</view>
@ -211,7 +211,7 @@
 									<u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true"
 										:src="item.goods_pic" width="100rpx" height="100rpx"></u--image>
 									<text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
-									<text>X{{item.product_num}}{{item.goods_unit}}</text>
+									<text>X{{item.product_num}}</text>
 								</view>
 							</view>
 						</view>
@ -320,7 +320,7 @@
 									<u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true"
 										:src="item.goods_pic" width="100rpx" height="100rpx"></u--image>
 									<text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
-									<text>X{{item.product_num}}{{item.goods_unit}}</text>
+									<text>X{{item.product_num}}</text>
 								</view>
 							</view>
 						</view>
@ -377,6 +377,9 @@
 	import {
 		getDetil
 	} from "@/api/logistics.js"
+	import {
+		Toast
+	} from "../../libs/uniApi"
 	export default {
 		data() {
 			return {
@ -419,6 +422,8 @@
 					setTimeout(() => {
 						uni.navigateBack()
 					}, 2000)
+				}).catch((err) => {
+					Toast(err.msg)
 				})
 				this.showPop = false

--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@ -315,6 +315,8 @@
 			// this.getUserIndex()
 			// this.getIndexList()
 			let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
+			this.getOrderList();
+			console.log("show")
 			getAreaManagerApi({
 				user_id
 			}).then(res => {
@ -335,7 +337,6 @@
 			this.initUserInfo();
 			this.showToask();
 			// this.initOaHomeDada();
-			this.getOrderList();
 			//#ifdef APP-PLUS
 			this.noticeFn();
 			// #endif
@ -434,6 +435,7 @@
 					// courier_id: 167
 				});
 				this.orderList = res.data.data;
+				console.log("获取列表")
 			},
 			goOrderList() {
 				uni.navigateTo({
--- a/store/modules/app.js
+++ b/store/modules/app.js
@ -33,6 +33,8 @@ const mutations = {
    state.token = null;
    Cache.clear('USER_INFO')
    Cache.clear('TOKEN')
+	
+	uni.clearStorageSync()
  },
  UPDATE_USERINFO(state, data) {
    let time = res.data.result.expires_time - Cache.time();
--- a/subpkg/merchantDetails/merchantDetails.vue
+++ b/subpkg/merchantDetails/merchantDetails.vue
@ -72,7 +72,8 @@
 				<view class="body">
 					<block v-for="(item, index) in extend.qualification">
 						<image @click="priview(item)" :src="item"></image>
-            <view v-if="index<extend.qualification.length-1" style="border-top: 1px dashed #0022c7;margin: 28rpx 0;">
+						<view v-if="index<extend.qualification.length-1"
+							style="border-top: 1px dashed #0022c7;margin: 28rpx 0;">
 						</view>
 					</block>
 				</view>
@ -86,11 +87,11 @@
 				</view>
 				<view class="body">
 					<view class="b_item">
-            <view>银行账户姓名:</view>
+						<view>开户银行名称:</view>
 						<view>{{extend.bank_username}}</view>
 					</view>
 					<view class="b_item">
-            <view>开户行:</view>
+						<view>银行卡号:</view>
 						<view>{{extend.bank_opening}}</view>
 					</view>
 					<view class="b_item">
@ -142,14 +143,19 @@
 				</view>
 			</view>
 		</u-popup>
-    <u-modal :show="tipShow" title="提示" content='确认信息无误再通过' closeOnClickOverlay showCancelButton @close="tipShow=false"
-      @cancel="tipShow=false" @confirm="$u.throttle(pass, 1500)"></u-modal>
+		<u-modal :show="tipShow" title="提示" content='确认信息无误再通过' closeOnClickOverlay showCancelButton
+			@close="tipShow=false" @cancel="tipShow=false" @confirm="$u.throttle(pass, 1500)"></u-modal>
 	</view>
 </template>

 <script>
-  import { Toast } from '../../libs/uniApi'
-  import { approveAudit, approveDetails } from "@/api/approve.js"
+	import {
+		Toast
+	} from '../../libs/uniApi'
+	import {
+		approveAudit,
+		approveDetails
+	} from "@/api/approve.js"
 	export default {
 		data() {
 			return {
@ -190,7 +196,8 @@
 					});
 					this.formData = res.data;
 					this.extend = this.formData?.extend;
-          this.extend.qualification ? this.extend.qualification = JSON.parse(this.extend.qualification) : this.extend
+					this.extend.qualification ? this.extend.qualification = JSON.parse(this.extend.qualification) :
+						this.extend
 						.qualification = []
 				} catch (e) {
 					//TODO handle the exception
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@ -152,13 +152,14 @@
 						})
 						// console.log(res1.data, res1.data.config.package.split('=')[1]);
 						let obj = {
-							"appid": res1.data.appid, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
-							"noncestr": res1.data.noncestr, // 随机字符串
-							"package": res1.data.package, // 固定值
-							"partnerid": res1.data.partnerid, // 微信支付商户号
-							"prepayid": res1.data.prepayid, // 统一下单订单号 
-							"timestamp": res1.data.timestamp, // 时间戳（单位：秒）
-							"sign": res1.data.sign
+							"appid": res1.data.config
+							.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+							"noncestr": res1.data.config.nonceStr, // 随机字符串
+							"package": res1.data.config.package, // 固定值
+							"partnerid": res1.data.config.partnerid, // 微信支付商户号
+							"prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号 
+							"timestamp": res1.data.config.timestamp, // 时间戳（单位：秒）
+							"sign": res1.data.config.paySign
 						}

 						uni.getProvider({