Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-react-cloud

src/pages/tabbar/individualOrder.vue

@@ -35,7 +35,7 @@
 			<view class="h-20rpx" />
 			<view class="card rounded-24rpx bg-white p-20rpx pb-0rpx mb-20rpx" v-for="(v, index) in pageHook.list"
 				:key="v.id">
-				<order-car visibleUser :visibleMchOrderStatus="false" :cardetail="v"
+				<order-car visibleUser :visibleMchOrderStatus="true" :cardetail="v"
 					:footerOperate="['refund', 'qrCodeDetail']" />
 			</view>
 		</z-paging>

src/sheep/api/user.ts

@@ -72,8 +72,8 @@ export default {
 			url: `/auth/oauth2/token`,
 			method: "POST",
 			params: query,
-			// data: `password=${encodeURIComponent(pwdForWire)}`,
-			data: `password=`+password,
+			data: `password=${encodeURIComponent(pwdForWire)}`,
+			// data: `password=`+password,
 			header: {
 				skipToken: true,
 				Authorization: BASIC_AUTH,