物流页面

components/company/company.vue

@@ -17,7 +17,7 @@
           </view>
           <view class="bottom">
             <view class="left">
-              <uni-icons type="location" color="#666666" size="13"></uni-icons>
+              <uni-icons type="location" color="#666666" size="14"></uni-icons>
               <view class="location">区域:</view>
             </view>
             <view style="flex: 1;">{{company.address}}</view>

components/companyFinance/companyFinance.vue

@@ -1,12 +1,12 @@
 <template>
   <view class="c_card">
-    <view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
+    <view class="f_card">
-      <view class="item">
+      <view class="item" @click="naviTo('/subpkg/topUp/topUp')">
         <view>公司账户余额(元)</view>
         <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
         <view class="price" v-else>0.00</view>
       </view>
-      <view class="item">
+      <view class="item" @click="naviTo('/subpkg/withdrawDeposit/withdrawDeposit')">
         <view>公司收益金额(元)</view>
         <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
         <view class="price" v-else>0.00</view>

components/districtSelector/districtSelectorTow.vue

@@ -1,14 +1,30 @@
 <template>
   <view class="component">
     <view class="title">地区信息</view>
+    
     <u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm">
-      <u-form-item v-if="datas && datas.street" label="村社" :required="!readonly" prop="village" @click="changeCity()" borderBottom>
+      <u-form-item label="地址" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
+        <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+      </u-form-item>
+      <u-form-item v-if="!formDataRead.street" label="乡镇" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
+        <u--input :value="formDataText.street" disabled disabledColor="#fff" placeholder="请选择镇"></u--input>
+        <u-icon slot="right" name="arrow-right"></u-icon>
+      </u-form-item>
+      <u-form-item v-if="!formDataRead.village" label="村社" :required="!readonly" prop="village" @click="changeCity('village')" borderBottom>
         <u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input>
         <u-icon slot="right" name="arrow-right"></u-icon>
       </u-form-item>
-      <u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom>
+      <u-form-item v-if="!formDataRead.brigade" label="小队" :required="!readonly" prop="brigade" borderBottom>
-        <u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
+        <u-checkbox-group 
-        <u-icon slot="right" name="arrow-right"></u-icon>
+            placement="row"
+            @change="changeBrigade"
+            >
+        	<view class="box">
+            <view class="box_item" v-for="item in brigadeList" :key="item.id">
+              <u-checkbox style="checkbox" :customStyle="{marginBottom: '12px',marginRight: '12px'}" activeColor="#3175f9" :label="item.brigade_name" :name="item.id"></u-checkbox>
+            </view>
+          </view>
+        </u-checkbox-group>
       </u-form-item>
     </u--form>
     <u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm"
@@ -35,14 +51,35 @@
       return {
         showProvince: false,
         formData: {
+          province: '',
+          city: '',
+          area: '',
+          street: '',
           village: '',
           brigade: '',
         },
         formDataText: {
+          province: '',
+          city: '',
+          area: '',
+          street: '',
           village: '',
           brigade: '',
         },
+        formDataRead: {
+          province: false,
+          city: false,
+          area: false,
+          street: false,
+          village: false,
+          brigade: false,
+        },
         rules: {
+          street: {
+            required: true,
+            message: '不能为空',
+            trigger: ['change', 'blur']
+          },
           village: {
             required: true,
             message: '不能为空',
@@ -55,11 +92,25 @@
             trigger: ['change', 'blur']
           },
         },
+        streetList: [],
         villageList: [],
         brigadeList: [],
         changeType: '', //当前选择的城市类型
       };
     },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formDataText.street = this.$props.datas.street_name;
+          this.formDataText.village = this.$props.datas.village_name;
+          this.formDataText.brigade = this.$props.datas.brigade_name;
+
+          this.formData.street = this.$props.datas.street_id;
+          this.formData.village = this.$props.datas.village_id;
+          this.formData.brigade = this.$props.datas.brigade_id;
+        }
+      }
+    },
     created() {
       if (!this.$props.readonly) {
         this.initProvinceAndCity();
@@ -67,22 +118,53 @@
         this.rules = {};
       }
     },
+    computed:{
+    	nowAddress(){
+    		let address = this.$store.state.app.userInfo;
+        let str = '';
+        address.province_name?str+=address.province_name:null;
+        address.city_name?str+=address.city_name:null;
+        address.area_name?str+=address.area_name:null;
+        address.street_name?str+=address.street_name:null;
+        address.village_name?str+=address.village_name:null;
+    		return str;
+    	}
+    },
     methods: {
       async validate() {
         return await this.$refs.districtForm.validate();
       },
       // 初始化
       async initProvinceAndCity() {
-        if(this.$store.state.app.userInfo.village)this.loadBrigade(this.$store.state.app.userInfo.village);
+        let user = this.$store.state.app.userInfo;
-        else if(this.$store.state.app.userInfo?.street)this.loadVillage(this.$store.state.app.userInfo.street);
+        Object.keys(this.formData).forEach(key => {
+          this.formData[key] = user[key];
+          this.formDataText[key] = user[key + '_name'];
+          if (user[key]&&key!='brigade') {
+            this.formDataRead[key] = true;
+            // 获取选择的列表
+            switch (key) {
+              case 'street':
+                this.loadVillage(this.formData['street']);
+                break;
+              case 'village':
+                this.loadBrigade(this.formData['village']);
+                break;
+            }
+          }
+        })
       },
       // 选择城市
       changeCity(type) {
         if (this.$props.readonly) return;
-        if (type&&this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
+        if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
         this.changeType = type;
         this.showProvince = true;
       },
+      // 多选小队
+      changeBrigade(e){
+        this.formData.brigade = e;
+      },
       // 选择列表
       changeList() {
         return this[this.changeType + 'List'];
@@ -99,14 +181,20 @@
         }
         this.formData[this.changeType] = e.value[0][this.changeType + '_code'];
         this.formDataText[this.changeType] = e.value[0][this.changeType + '_name'];
+        // 加载下一级城市信息
+        switch (this.changeType) {
+          case 'area':
+            this.loadStreet(this.formData['area']);
+            break;
+          case 'street':
+            this.loadVillage(this.formData['street']);
+            break;
+          case 'village':
+            this.loadBrigade(this.formData['village']);
+            break;
+        }
         // 清空之前所选信息
         if (flag) switch (this.changeType) {
-          case 'province':
-            this.formData.city = '';
-            this.formDataText.city = ''
-          case 'city':
-            this.formData.area = '';
-            this.formDataText.area = ''
           case 'area':
             this.formData.street = '';
             this.formDataText.street = ''
@@ -119,6 +207,13 @@
         }
         this.showProvince = false;
       },
+      loadStreet(code) {
+        commonStreet({
+          street: code
+        }).then(res => {
+          this.streetList = res.data;
+        })
+      },
       loadVillage(code) {
         commonVillage({
           village: code
@@ -153,5 +248,15 @@
         margin-right: 8rpx;
       }
     }
+    // .checkbox{
+    //   margin: 28rpx;
+    // }
+    .box{
+      display: flex;
+      flex-wrap: wrap;
+    }
+  }
+  .u-checkbox-group--row[data-v-2ef8bac9]{
+    flex: 1;
   }
 </style>

pages/logistics/index.vue

@@ -1,19 +1,25 @@
 <template>
 	<view class="content">
-		<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white'
+		<view style="background-color: #fff;padding: 18rpx 28rpx 0 18rpx;">
+			<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='#f5f5f5'
 				v-model="keywords"></u-search>
-		<view style="margin: 10rpx 0 0 0;">
 		</view>
-		<u-sticky bgColor="#F5F5F5">
+		<!-- <view style="margin: 10rpx 0 0 0;"></view> -->
-			<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="list" lineColor='#3274F9' inactiveStyle='color:#666' activeStyle="color:#3274F9"
+				:current="curNow" @change="sectionChange" :scrollable="false"></u-tabs>
 		</u-sticky>
 		<view v-if="!orderlist.length">
 			<u-empty mode="data" icon="../../static/img/empty/data.png">
 			</u-empty>
 		</view>
+
 		<view v-else>
-			<logistiCard :ref="'logistiCard'+index" v-for='(item,index) in orderlist' @getlist="getOrderList"
+			<logistiCard v-for='(item,index) in orderlist' @getlist="getOrderList" @showTost='showToast'
-				@showTost='showToast' :goodsInfo="item" :key="index">
+				:goodsInfo="item" :key="index">
+
+
+
 			</logistiCard>
 		</view>
 		<u-toast ref="uToast"></u-toast>
@@ -35,14 +41,20 @@
 		data() {
 			return {
 				keywords: "",
-				list: ['待取货', '已取货', '已送达'],
+				list: [{
+					name: '待取货'
+				}, {
+					name: '已取货'
+				}, {
+					name: '已送达'
+				}],
 				curNow: 0,
 				orderlist: []
 			}
 		},
 		methods: {
-			sectionChange(index) {
+			sectionChange(e) {
-				this.curNow = index;
+				this.curNow = e.index;
 				this.getOrderList()
 			},
 			showToast() {
@@ -83,8 +95,4 @@
 </script>
 
 <style lang='scss'>
-	.content {
-		background-color: #F5F5F5;
-		padding: 1vh 2vw;
-	}
 </style>

pages/oaTask/oaTask.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="all_box">
-    <view class="task_list">
+    <u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
+    <view v-else class="task_list">
       <!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
       <view v-for="item in list" :key="item.id">
         <task-item :datas="item"></task-item>
       </view>
-      <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
     </view>
     <!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->

subpkg/archives/archives.vue

@@ -5,11 +5,12 @@
         <view class="top">
           <image class="avatar" src="../../static/img/public/record.png"></image>
           <view class="body">
-						<view class="t_top">
             <view>姓名:<text class="name">{{item.name}}</text></view>
-							<view>电话:<text class="mobile">{{item.phone}}</text></view>
+            <view>
+              片区:<text class="name">{{item.village_name}}</text>
+              <text class="name" style="margin-left: 0;" v-for="brigade_name in item.brigade_name">{{brigade_name.brigade_name}}</text>
             </view>
-						<view class="t_bottom">片区:<text class="address">{{item.address}}</text></view>
+            <view>电话:<text class="name">{{item.phone}}</text></view>
           </view>
         </view>
         <u-line color="#cccccc"></u-line>
@@ -62,6 +63,7 @@
         this.user_id = this.$store.state.app.userInfo.id;
       }
       this.loadInformationList();
+      uni.$on('loadArchives', this.initLoad);
     },
     onShow() {
 
@@ -169,33 +171,16 @@
 
         .body {
           flex: 1;
-
+          font-size: 28rpx;
-					.t_top {
+          color: #333;
-						display: flex;
+          font-weight: bold;
-						justify-content: space-between;
-						margin-bottom: 18rpx;
 
           .name {
-							font-size: 32rpx;
-							color: #333;
-						}
-
-						.mobile {
             font-size: 28rpx;
             color: #333;
-						}
+            font-weight: 500;
-					}
+            display: inline-block;
-
+            margin-left: 18rpx;
-					.t_bottom {
-						width: 500rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-
-						.address {
-							font-size: 28rpx;
-							color: #333;
-						}
           }
         }
       }

subpkg/archivesDetail/archivesDetail.vue

@@ -182,8 +182,13 @@
     computed: {
       nowAddress() {
         let address = this.$store.state.app.userInfo;
-        return address.province_name + address.city_name + address.area_name + address.street_name + address
+        let str = '';
-          .village_name + address.brigade_name;
+        address.province_name?str+=address.province_name:null;
+        address.city_name?str+=address.city_name:null;
+        address.area_name?str+=address.area_name:null;
+        address.street_name?str+=address.street_name:null;
+        address.village_name?str+=address.village_name:null;
+        return str;
       }
     },
     methods: {

subpkg/captain/captain.vue

@@ -46,14 +46,21 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
+                  <view class="location">
+                    <text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
+                    <text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
                   </view>
                 </view>
-              <view class="company">
+              </view>
-                <text>
+              <view class="info_bottom">
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -313,7 +320,7 @@
 
             .item {
               display: flex;
-              align-items: center;
+              align-items: flex-start;
             }
 
             .phone {
@@ -322,12 +329,12 @@
 
             .location {
               width: 320rpx;
-              white-space: nowrap;
+              // white-space: nowrap;
-              /* 不换行 */
+              // /* 不换行 */
-              overflow: hidden;
+              // overflow: hidden;
-              /* 将超出文本隐藏 */
+              // /* 将超出文本隐藏 */
-              text-overflow: ellipsis;
+              // text-overflow: ellipsis;
-              /* 使用省略号表示被隐藏的文本 */
+              // /* 使用省略号表示被隐藏的文本 */
               color: #000;
             }
           }
@@ -337,16 +344,17 @@
 
             text {
               margin-right: 30rpx;
+              flex-shrink: 0;
             }
 
             .itm {
               width: 320rpx;
-              white-space: nowrap;
+              // white-space: nowrap;
-              /* 不换行 */
+              // /* 不换行 */
-              overflow: hidden;
+              // overflow: hidden;
-              /* 将超出文本隐藏 */
+              // /* 将超出文本隐藏 */
-              text-overflow: ellipsis;
+              // text-overflow: ellipsis;
-              /* 使用省略号表示被隐藏的文本 */
+              // /* 使用省略号表示被隐藏的文本 */
               color: #000;
             }
           }

subpkg/companyInfo/companyInfo.vue

@@ -145,6 +145,9 @@
 </script>
 
 <style lang="scss">
+  page{
+    
+  }
   .fixed_box {
     width: 100%;
     position: fixed;

subpkg/newArchives/newArchives.vue

@@ -229,7 +229,13 @@
 	computed:{
 		nowAddress(){
 			let address = this.$store.state.app.userInfo;
-			return address.province_name+address.city_name+address.area_name+address.street_name+address.village_name+address.brigade_name;
+      let str = '';
+      address.province_name?str+=address.province_name:null;
+      address.city_name?str+=address.city_name:null;
+      address.area_name?str+=address.area_name:null;
+      address.street_name?str+=address.street_name:null;
+      address.village_name?str+=address.village_name:null;
+      return str;
 		}
 	},
     methods: {
@@ -279,6 +285,7 @@
 		    title: "添加成功",
 		    success: () => {
 		      setTimeout(() => {
+            uni.$emit('loadArchives');
 		        uni.navigateBack()
 		      }, 1000)
 		    }

subpkg/newPersonnel/newPersonnel.vue

@@ -112,7 +112,7 @@
           sex: '',
           avatar: '',
           nickname: '',
-          address: '测试地址',
+          address: '',
           qualification: {
             id_card: "",
             id_card_b: "",

subpkg/personnel/personnel.vue

@@ -23,14 +23,18 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
+                  <view class="location">{{ (item.street_name||'')+(item.village_name||'') }}</view>
                 </view>
               </view>
-              <view class="company">
+              <view class="info_bottom">
-                <text>
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -223,7 +227,7 @@
 
               .item {
                 display: flex;
-                align-items: center;
+                align-items: flex-start;
               }
 
               .phone {
@@ -232,12 +236,12 @@
 
               .location {
                 width: 350rpx;
-                white-space: nowrap;
+                // white-space: nowrap;
-                /* 不换行 */
+                // /* 不换行 */
-                overflow: hidden;
+                // overflow: hidden;
-                /* 将超出文本隐藏 */
+                // /* 将超出文本隐藏 */
-                text-overflow: ellipsis;
+                // text-overflow: ellipsis;
-                /* 使用省略号表示被隐藏的文本 */
+                // /* 使用省略号表示被隐藏的文本 */
                 color: #000;
               }
             }

subpkg/personnelDetails/personnelDetails.vue

@@ -37,7 +37,8 @@
 						</view>
 					</view>
 					<view class="bottom">
-						负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}
+						负责区域:<text>{{userInfo.street_name+(userInfo.village_name||'')}}</text>
+            <text v-for="(item, index) in userInfo.brigade_name">{{item.brigade_name}}</text>
 					</view>
 					<u-popup :show="show" :round="10" mode="center">
 						<view class="popup">

subpkg/topUp/topUp.vue

@@ -213,6 +213,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }
@@ -221,6 +225,7 @@
     display: flex;
     flex-direction: column;
     padding: 0 28rpx;
+    margin-top: 50rpx;
 
     .title {
       font-size: 32rpx;

subpkg/withdrawDeposit/withdrawDeposit.vue

@@ -6,7 +6,8 @@
         <view class="title">提现信息</view>
         <view class="item">
           <text>提现账户</text>
-          <text>{{$store.state.app.userInfo.account||''}}</text>
+          <text v-if="$store.state.app.userInfo.admin_id">{{$store.state.app.userInfo.company.company_name||''}}</text>
+          <text v-else>{{$store.state.app.userInfo.account||''}}</text>
         </view>
         <view class="item">
           <text>可用余额</text>
@@ -141,7 +142,7 @@
 
     .card {
       width: 694rpx;
-      height: 180rpx;
+      min-height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -167,6 +168,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }