xiaohaizhao 2 jaren geleden
bovenliggende
commit
4a9476fade

+ 7 - 5
packageA/returnOne/detail.wxml

@@ -7,11 +7,13 @@
 		<view class="exp">经销商:{{detail.enterprisename || '暂无'}}</view>
 		<view class="exp">经销编号:{{detail.agentnum || '暂无'}}</view>
 	</block>
-	<view class="exp">单据类型/日期:{{detail.type}} / {{detail.billdate || '暂无'}}</view>
+	<view class="exp">单据类型:{{detail.type}}</view>
+	<view class="exp">单据日期:{{detail.billdate || '暂无'}}</view>
 	<view class="exp">来源单号:{{detail.sonum || '暂无'}}</view>
 	<view class="exp">是否实物退回:{{detail.isitemreturn==1?'是':'否'}}</view>
-	<view class="exp">订单账户:{{detail.accountname||"--"}}</view>
-	<view class="exp">订单状态:{{detail.status}}</view>
+	<view class="exp">金额:¥{{handleHide.query(detail.returnamount||0,hidePrice)}}元</view>
+	<view class="exp">资金账户:{{detail.accountname||"--"}}</view>
+	<view class="exp">单据状态:{{detail.status}}</view>
 </view>
 
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
@@ -19,7 +21,7 @@
 	<Product disabled="{{detail.status != '新建'}}" detail="{{detail}}" slot="商品明细" id="Product" bind:onSuccess="getDetail" />
 	<view style="height: 160rpx;" />
 </Yl_FunTabs>
-
+<!-- 
 <view class="footer">
 	<view class="price">
 		<view class="count">
@@ -31,6 +33,6 @@
 		<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">提交申请</van-button>
 		<van-button custom-class='but' wx:if="{{detail.status=='提交'}}" bind:click="notarize">取消申请</van-button>
 	</view>
-</view>
+</view> -->
 
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 6 - 1
pages/index/userCenter/index.scss

@@ -23,16 +23,21 @@
             margin-left: 30rpx;
 
             .user-name {
+                display: flex;
                 height: 50rpx;
                 font-size: 36rpx;
                 font-weight: bold;
                 margin-top: 16rpx;
 
+                .name {
+                    width: 350rpx;
+                }
+
                 text {
                     display: inline-block;
                     height: 40rpx;
                     font-size: 28rpx;
-                    margin-left: 40rpx;
+                    margin-left: 20rpx;
                 }
             }
 

+ 1 - 1
pages/index/userCenter/index.wxml

@@ -4,7 +4,7 @@
 			<van-image image-class="v-img" round width="128rpx" height="128rpx" src="{{userMsg.attinfos[0].url||'/static/image/user.png'}}" />
 			<view class="user-msg">
 				<view class="user-name">
-					{{userMsg.name}}<text>{{userMsg.hr.position}}</text>
+					<view class="name line-1">{{userMsg.name}}</view><text>{{userMsg.hr.position}}</text>
 				</view>
 				<view class="user-phone">
 					{{userMsg.phonenumber}}

+ 1 - 1
pages/login/modules/agreement.js

@@ -30,7 +30,7 @@ Component({
                 title: '加载中...',
             })
             wx.downloadFile({
-                url: 'https://yossys80658.obs.cn-east-2.myhuaweicloud.com/system/E%E8%AE%A2%E5%8D%95%E9%9A%90%E7%A7%81%E4%BF%9D%E6%8A%A4.docx',
+                url: 'https://ccyosg20230413.obs.cn-east-3.myhuaweicloud.com/system/%E6%A5%9A%E6%A5%9A%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE.docx',
                 success: (res) => {
                     wx.openDocument({
                         filePath: res.tempFilePath,

+ 1 - 1
project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "%E6%A5%9A%E6%A5%9AE%E8%AE%A2%E5%8D%95",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "libVersion": "2.25.3",
   "condition": {