Merge branch 'master'

api/company.js

@@ -66,3 +66,12 @@ export const postsms = (data) => oahttp.post('/company/postsms', data)
  */
 export const sss = (data) => oahttp.post('/company/postsms', data)
 
+/**
+ * 查询甲方公司信息
+ */
+export const getPartyACompany = (data) => oahttp.get('/company/getPartyACompany', data)
+
+/**
+ * 查询押金凭证记录
+ */
+export const getDepositRechargeTransferVoucherList = (data) => oahttp.get('/company/getDepositRechargeTransferVoucherList', data)

components/company/company.vue

@@ -427,7 +427,6 @@
 				brigade.forEach((item) => {
 					this.brigade += item.brigade_name ?? ''
 				})
-				uni.$emit('companyInfo', this.company); //发送全局事件
 				this.user = res.data.user;
 				this.contract = res.data.contract;
 				this.skeleton = false;

components/companyFinance/companyFinance.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="c_card">
 		<view class="f_card">
-			<view class="item" @click="navTo('/subpkg/topUp/topUp')">
+			<view class="item" @click="navTo('/subpkg/topUpDeposit/topUpDeposit')">
 				<view>押金(元)</view>
 				<view class="price" v-if="company.deposit">{{cCount(+company.deposit)}}</view>
 				<view class="price" v-else>0.00</view>
@@ -28,9 +28,7 @@
 			</view>
 		</view>
 		<view class="f_list">
-
 			<view class="item" v-for="(item, index) in list" :key="index">
-
 				<view class="top">
 					账单日期: {{current?item.month:item.create_time}}
 				</view>
@@ -61,10 +59,6 @@
 					</view>
 				</view>
 			</view>
-
-
-
-
 			<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
 				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
 		</view>
@@ -74,7 +68,8 @@
 <script>
 	import {
 		accountMonthList,
-		accountDateList
+		accountDateList,
+    companyView
 	} from "@/api/company.js"
 	import {
 		Toast
@@ -101,12 +96,14 @@
 			};
 		},
 		mounted() {
-			uni.$on('companyInfo', (e) => {
+      this.loadCompany();
-				this.company = e;
 			this.initLoad();
-			})
 		},
 		methods: {
+      async loadCompany(){
+        let res = await companyView();
+        this.company = res.data.company;
+      },
 			navTo(url) {
 				if(url){
           uni.showLoading({

config/app.js

@@ -3,8 +3,9 @@ let httpApi; // 总域名
 let httpApiTwo; // 物流系统域名
 
 // const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+const env = 'prod'; // 生产
-const env = 'prew'; // 预上线
+// const env = 'prew';    // 预上线
+// const env = 'local'; // 本地
 
 switch (env) {
 	case 'prod':
@@ -17,6 +18,11 @@ switch (env) {
 		httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
 		httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
 		break;
+	case 'local':
+		httpApi = 'http://192.168.1.12:8001' //预上线
+		httpApiThree = 'http://192.168.1.12:8001' //预上线
+		httpApiTwo = 'http://192.168.1.12:8001' //预上线
+		break;
 	default:
 		httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
 		httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试

manifest.json

@@ -3,8 +3,8 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.2.1",
+    "versionName" : "1.2.4",
-    "versionCode" : 121,
+    "versionCode" : 124,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -25,6 +25,15 @@
       }
 
     },
+    {
+      "path": "pages/business/business",
+      "style": {
+        "navigationBarTitleText": "商机信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+    },
     {
       "path": "pages/business/business",
       "style": {
@@ -80,6 +89,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/oaNews/oaNews",
+      "style": {
+        "navigationBarTitleText": "公告详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/oaNews/oaNews",
       "style": {
@@ -89,6 +106,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/logistics/index",
+      "style": {
+        "navigationBarTitleText": "订单列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/logistics/index",
       "style": {
@@ -98,6 +123,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/logistics/te",
+      "style": {
+        "navigationBarTitleText": "测试",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/logistics/te",
       "style": {
@@ -107,6 +140,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/logistics/logisticDetil",
+      "style": {
+        "navigationBarTitleText": "订单详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/logistics/logisticDetil",
       "style": {
@@ -116,6 +157,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/logistics/deliveryDetil",
+      "style": {
+        "navigationBarTitleText": "配送信息",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/logistics/deliveryDetil",
       "style": {
@@ -125,6 +174,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/logistics/post",
+      "style": {
+        "navigationBarTitleText": "驿站",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/logistics/post",
       "style": {
@@ -134,6 +191,14 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/updatePassword/updatePassword",
+      "style": {
+        "navigationBarTitleText": "修改密码",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/updatePassword/updatePassword",
       "style": {
@@ -143,6 +208,31 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "uni_modules/guyue-updater/pages/updater",
+      "style": {
+        "app-plus": {
+          "animationDuration": 200,
+          "animationType": "fade-in",
+          "background": "transparent",
+          "backgroundColorTop": "transparent",
+          "bounce": "none",
+          "popGesture": "none",
+          "scrollIndicator": false,
+          "titleNView": false
+        },
+        "backgroundColor": "transparent",
+        "disableScroll": true,
+        "navigationStyle": "custom"
+      }
+    }, {
+      "path": "pages/moreFun/moreFun",
+      "style": {
+        "navigationBarTitleText": "更多功能",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "uni_modules/guyue-updater/pages/updater",
       "style": {
@@ -169,6 +259,22 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/otherSetting/otherSetting",
+      "style": {
+        "navigationBarTitleText": "其他设置",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+    }, {
+      "path": "pages/webView/webView",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
     }, {
       "path": "pages/otherSetting/otherSetting",
       "style": {
@@ -188,6 +294,37 @@
 
     }
   ],
+  "subPackages": [{
+    "root": "pages/views",
+    "name": "views",
+    "pages": [{
+        "path": "application",
+        "style": {
+          "navigationBarTitleText": "地图首页",
+          "enablePullDownRefresh": false
+        }
+      },
+      {
+        "path": "new_task",
+        "style": {
+          "navigationBarTitleText": "新建任务",
+          "enablePullDownRefresh": false
+        }
+      },
+      {
+        "path": "com_approve",
+        "style": {
+          "navigationBarTitleText": "通用审批",
+          "enablePullDownRefresh": false
+        }
+      }, {
+        "path": "personal_center",
+        "style": {
+          "navigationBarTitleText": "个人中心1",
+          "enablePullDownRefresh": false
+        }
+    }
+  ],
   "subPackages": [{
     "root": "pages/views",
     "name": "views",
@@ -218,6 +355,12 @@
           "enablePullDownRefresh": false
         }
 
+      }, {
+        "path": "task_details",
+        "style": {
+          "navigationBarTitleText": "",
+          "enablePullDownRefresh": false
+        }
       }, {
         "path": "task_details",
         "style": {
@@ -225,6 +368,12 @@
           "enablePullDownRefresh": false
         }
 
+      }, {
+        "path": "personal_center_two",
+        "style": {
+          "navigationBarTitleText": "个人中心2",
+          "enablePullDownRefresh": false
+        }
       }, {
         "path": "personal_center_two",
         "style": {
@@ -232,6 +381,14 @@
           "enablePullDownRefresh": false
         }
 
+      }, {
+        "path": "public_document",
+        "style": {
+          "navigationBarTitleText": "公司公示文档",
+          "enablePullDownRefresh": false,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
       }, {
         "path": "public_document",
         "style": {
@@ -241,6 +398,14 @@
           "navigationBarTextStyle": "white"
         }
 
+      }, {
+        "path": "leave_request",
+        "style": {
+          "navigationBarTitleText": "请假申请",
+          "enablePullDownRefresh": false,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
       }, {
         "path": "leave_request",
         "style": {
@@ -300,6 +465,25 @@
         "navigationBarBackgroundColor": "#0022C7",
         "navigationBarTextStyle": "white"
       }
+      },
+      {
+        "path": "topUpDeposit/topUpDeposit",
+        "style": {
+          "navigationBarTitleText": "押金充值",
+          "enablePullDownRefresh": true,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
+
+      },
+      {
+        "path": "contract/contract",
+        "style": {
+          "navigationBarTitleText": "合同管理",
+          "enablePullDownRefresh": true,
+          "navigationBarBackgroundColor": "#0022C7",
+          "navigationBarTextStyle": "white"
+        }
 
     }, {
       "path": "contractDetail/contractDetail",

subpkg/companyInfo/companyInfo.vue

@@ -215,7 +215,10 @@
 		},
 		onPullDownRefresh() {
 			if (this.current == 1) this.initLoad();
-      else if (this.current == 2) this.$refs.financeRef.initLoad();
+      else if (this.current == 2) {
+          this.$refs.financeRef.loadCompany();
+          this.$refs.financeRef.initLoad();
+      }
 			else if (this.current == 3) this.$refs.taskRef.initLoadConfig();
 			this.$u.sleep(500).then(() => {
 				uni.stopPullDownRefresh()

subpkg/topUpDeposit/topUpDeposit.vue

@@ -0,0 +1,259 @@
+<template>
+  <view class="">
+    <view class="info">
+      <view class="bg"></view>
+      <view class="card">
+        <view class="title">充值信息</view>
+        <view class="item">
+          <text>充值账户</text>
+          <text>{{$store.state.app.userInfo.company.company_name||''}}</text>
+        </view>
+        <u-line style="margin: 20rpx 0;"></u-line>
+        <view class="item">
+          <text>收款公司</text>
+          <text>{{partyA.company_name}}</text>
+        </view>
+        <view class="item" @click="copyPhone(partyA.qualification.corporate_account, '对公账号')">
+          <text>对公账号</text>
+          <text>{{partyA.qualification.corporate_account||'暂无信息'}}</text>
+        </view>
+      </view>
+    </view>
+    <view class="deposit-list">
+      <view class="card" v-for="(item, index) in list">
+        <view class="item"><view>创建时间:</view><view class="text">{{item.create_time}}</view></view>
+        <view class="item"><view>充值金额:</view><view class="text green">{{item.deposit}}</view>元</view>
+        <view class="item" @click="previewVoucher(item.voucher)"><view>充值凭证:</view><view class="text blue">查看凭证</view></view>
+      </view>
+    </view>
+    <u-empty v-if="list.length==0&&loadConfig.status=='nomore'" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
+    <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+    	:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+  </view>
+</template>
+
+<script>
+  import { Toast } from '@/libs/uniApi.js'
+  import { getPartyACompany, getDepositRechargeTransferVoucherList } from "@/api/company.js"
+  export default {
+    data() {
+      return {
+        partyA: {
+          id:"",
+          company_name:"",
+          qualification:{
+            corporate_account: ""
+          }
+        },
+        list: [],
+        loadConfig: {
+        	page: 1,
+        	limit: 15,
+        	lastpage: '',
+        	loadingText: '努力加载中',
+        	loadmoreText: '轻轻上拉',
+        	nomoreText: '我也是有底线的~~',
+        	status: 'loadmore'
+        },
+      }
+    },
+    // 点击充值记录
+    onNavigationBarButtonTap(res){
+      if (res.index === 0) {
+        uni.navigateTo({
+          url: '/subpkg/topUpList/topUpList'
+        })
+      }
+    },
+    onLoad(options) {
+      this.loadPartyACompany();
+      this.initLoad();
+    },
+    onReachBottom() {
+      this.loadList()
+    },
+    methods: {
+      async loadPartyACompany(){
+        let res = await getPartyACompany();
+        if(res.data.qualification){
+          try{
+            res.data.qualification = JSON.parse(res.data.qualification);
+          }catch(e){
+            console.log(e);
+          }
+        }
+        this.partyA = res.data;
+        if(!this.partyA.qualification.corporate_account)this.partyA.qualification.corporate_account="";
+      },
+      async initLoad() {
+      	this.loadConfig.page = 1;
+      	this.loadConfig.status = "loadmore";
+      	this.list = [];
+      	await this.loadList();
+      },
+      async loadList(){
+        if (this.loadConfig.status == "nomore") return;
+        this.loadConfig.status = "loading";
+        let res = await getDepositRechargeTransferVoucherList({
+        	page: this.loadConfig.page,
+        	limit: this.loadConfig.limit
+        })
+        this.loadConfig.status = "loadmore"
+        if (res.data.data.length < this.loadConfig.limit) {
+        	this.loadConfig.status = "nomore"
+        } else {
+        	this.loadConfig.page++;
+        }
+        this.list = [...this.list, ...res.data?.data]
+      },
+      previewVoucher(str=""){
+        if(str.substring(str.length-4, str.length)=='.pdf'){ // 凭证为PDF时查看PDF
+          uni.navigateTo({
+          	url: `/subpkg/pdfView/pdfView?url=${str}`
+          })
+        }else {
+          uni.previewImage({
+          	urls: [str],
+          	longPressActions: {
+          		itemList: ['保存图片'],
+          		success: function(data) {
+          			if (data.tapIndex === 0) {
+          				uni.saveImageToPhotosAlbum({
+          					filePath: url,
+          					success: function() {
+          						uni.showToast({
+          							title: '保存成功',
+          							icon: 'success'
+          						})
+          					},
+          					fail: function() {
+          						uni.showToast({
+          							title: '保存失败',
+          							icon: 'none'
+          						})
+          					}
+          				})
+          			}
+          		}
+          	}
+          })
+        }
+      },
+      copyPhone(str = "", type = "号码") {
+      	if (str) uni.setClipboardData({
+      		data: str + "",
+      		success: (e) => {
+      			Toast(type + '已复制')
+      		},
+      		fail: (e) => {
+      			Toast('复制失败')
+      		}
+      	})
+      }
+    },
+    onPullDownRefresh() {
+      this.initLoad().then(()=>{
+        setTimeout(()=>{
+          uni.stopPullDownRefresh()
+        }, 500)
+      })
+    }
+  }
+</script>
+
+<style lang="scss">
+  page {
+    background-color: #fff;
+  }
+
+  .info {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    height: 350rpx;
+
+    .bg {
+      background-color: $theme-oa-color;
+      height: 200rpx;
+      width: 100vw;
+      border-radius: 0rpx 0rpx 28rpx 28rpx;
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+
+    .card {
+      width: 694rpx;
+      min-height: 180rpx;
+      background: #FFFFFF;
+      margin-top: 38.55rpx;
+      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
+      opacity: 1;
+      padding: 31.5rpx 28rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
+      position: absolute;
+      top: 0;
+
+      .title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        padding-bottom: 10rpx;
+      }
+
+      .item {
+        display: flex;
+        justify-content: space-between;
+        font-size: 32rpx;
+        font-weight: 400;
+        color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
+      }
+    }
+  }
+
+  .deposit-list{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .card {
+      width: 694rpx;
+      min-height: 180rpx;
+      background: #FFFFFF;
+      margin-bottom: 28rpx;
+      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
+      opacity: 1;
+      padding: 31.5rpx 28rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
+    
+      .item{
+        font-size: 28rpx;
+        display: flex;
+        justify-content: left;
+        
+        .text{
+          margin-left: 12rpx;
+          color: #999;
+        }
+        
+        .green{
+          color: #4cd964;
+        }
+        
+        .blue{
+          color: #0122c7;
+        }
+      }
+    }
+  }
+</style>