2021.3.11

src/pages/order/examine.vue

@@ -115,21 +115,30 @@
             <el-form label-width="100px">
               <el-form-item label="收货信息" class="other_address">
                 <i class="el-icon-edit-outline cur" @click="getUserAddress" />
-                <span>代理名称: {{ orderDetail.get_user && orderDetail.get_user.nickname }}</span>
+                <!-- <span>代理名称: {{ orderDetail.get_user && orderDetail.get_user.nickname }}</span> -->
                 <span>
                   收货人: {{ orderDetail.get_address && orderDetail.get_address.username }}
                 </span>
                 <span>联系方式: {{ orderDetail.get_address && orderDetail.get_address.mobile }}</span>
                 <span>收货地址: {{ orderDetail.get_address && `${orderDetail.get_address.province}${orderDetail.get_address.city}${orderDetail.get_address.town}${orderDetail.get_address.address}` }}</span>
               </el-form-item>
-              <el-form-item
+              <el-form-item label="所属信息">
+                <template v-if="orderDetail.belong_user">
+                  <i class="el-icon-edit-outline cur" @click="edit = true; getBelongUser()" />
+                  <span>昵称: {{ orderDetail.belong_user && orderDetail.belong_user.nickname }}</span>
+                  <span>姓名: {{ orderDetail.belong_user && orderDetail.belong_user.realname }}</span>
+                  <span>手机号: {{ orderDetail.belong_user && orderDetail.belong_user.mobile }}</span>
+                </template>
+                <span v-else>该订单暂无所属者</span>
+              </el-form-item>
+              <!-- <el-form-item
                 v-if="orderDetail.get_address && (orderDetail.get_address.nickname || orderDetail.get_address.level)"
                 label=""
                 class="other_address"
               >
                 <span>收货人昵称: <span style="color:red">{{ orderDetail.get_address && orderDetail.get_address.nickname }}</span></span>
                 <span>收货人等级: <span style="color:red">{{ (orderDetail.get_address && orderDetail.get_address.level) | levelName }}</span></span>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="备注说明">
                 <div class="remark_container">
                   <i class="el-icon-edit-outline cur" @click="dialog.remark = true" />
@@ -143,15 +152,6 @@
                   <div v-else>无</div>
                 </div>
               </el-form-item>
-              <el-form-item label="所属者信息:">
-                <template v-if="orderDetail.belong_user">
-                  <i class="el-icon-edit-outline cur" @click="getBelongUser" />
-                  <span>昵称: {{ orderDetail.belong_user && orderDetail.belong_user.nickname }}</span>
-                  <span>姓名: {{ orderDetail.belong_user && orderDetail.belong_user.realname }}</span>
-                  <span>手机号: {{ orderDetail.belong_user && orderDetail.belong_user.mobile }}</span>
-                </template>
-                <span v-else>该订单暂无所属者</span>
-              </el-form-item>
               <el-form-item label="赠品信息">
                 <ul class="zengpin_list">
                   <li v-for="item in orderDetail.get_order_gift" v-show="item.pivot && item.pivot.num > 0" :key="item.id">
@@ -710,7 +710,12 @@
           <el-input v-model="addressForm.mobile" placeholder="手机号" minlength="11" maxlength="11" show-word-limit style="width: 500px" />
         </el-form-item>
         <el-form-item label="地区:">
-          <VDistpicker :province="addressForm.provice" :city="addressForm.city" :area="addressForm.area" @province="province => addressForm.provice = province.value" @city="city => addressForm.city = city.value" @area="area => addressForm.area = area.value" />
+          <el-cascader
+            v-model="addressForm.areaAll"
+            :options="provinces"
+            style="width: 500px"
+          />
+          <!-- <VDistpicker :province="addressForm.provice" :city="addressForm.city" :area="addressForm.area" @province="province => addressForm.provice = province.value" @city="city => addressForm.city = city.value" @area="area => addressForm.area = area.value" /> -->
         </el-form-item>
         <el-form-item label="地址:">
           <el-input v-model="addressForm.address" type="textarea" placeholder="地址" maxlength="50" show-word-limit style="width: 500px" />
@@ -794,9 +799,10 @@ const isMoney = /^\d+(\.\d{1,2})?$/
 // 组件
 import MIXIN_CHANGGOODLIST from './mixin/changGoodList'
 import ChangeGoodList from './components/ChangeGoodList'
-import VDistpicker from 'v-distpicker'
+// import VDistpicker from 'v-distpicker'
+import provinces from '@/assets/json/provinces'
 export default {
-  components: { ChangeGoodList, VDistpicker },
+  components: { ChangeGoodList },
   filters: {
     levelName(level) {
       let out
@@ -868,6 +874,7 @@ export default {
       loadingFull: false,
       tabIndex: '1',
       edit: false,
+      provinces: provinces,
       dialog: {
         remark: false,
         receive: false,
@@ -885,6 +892,7 @@ export default {
       addressForm: {
         name: '',
         mobile: '',
+        areaAll: '',
         provice: '',
         city: '',
         area: '',
@@ -1042,7 +1050,6 @@ export default {
       this.getBelongUser()
     },
     getBelongUser() { // 获取订单所属信息
-      this.edit = true
       const loading = this.$loading()
       this.belongUserParams.order_num = this.orderDetail.order_num
       belongUsers(this.belongUserParams).then(res => {
@@ -1559,15 +1566,16 @@ export default {
       this.addressForm.city = item.city
       this.addressForm.area = item.area
       this.addressForm.address = item.address
+      this.addressForm.areaAll = [item.provice, item.city, item.area]
       this.address_type = false
       this.dialog.add_address = true
     },
     // 修改地址
     submitEditAddress() {
-      const { name, mobile, provice, city, area, address } = this.addressForm
+      const { name, mobile, provice, areaAll, city, area, address } = this.addressForm
       if (name && mobile && provice && city && area && address) {
         this.loadingFull = true
-        updateOrderAddress({ address_id: this.addressId, name, mobile, province: provice, city, area, address }).then(res => {
+        updateOrderAddress({ address_id: this.addressId, name, mobile, province: areaAll[0], city: areaAll[1], area: areaAll[2], address }).then(res => {
           this.loadingFull = false
           if (res.code === 200) {
             this.dialog.add_address = false

src/pages/order/examine2.vue

@@ -115,21 +115,30 @@
             <el-form label-width="100px">
               <el-form-item label="收货信息" class="other_address">
                 <i class="el-icon-edit-outline cur" @click="getUserAddress" />
-                <span>代理名称: {{ orderDetail.get_user && orderDetail.get_user.nickname }}</span>
+                <!-- <span>代理名称: {{ orderDetail.get_user && orderDetail.get_user.nickname }}</span> -->
                 <span>
                   收货人: {{ orderDetail.get_address && orderDetail.get_address.username }}
                 </span>
                 <span>联系方式: {{ orderDetail.get_address && orderDetail.get_address.mobile }}</span>
                 <span>收货地址: {{ orderDetail.get_address && `${orderDetail.get_address.province}${orderDetail.get_address.city}${orderDetail.get_address.town}${orderDetail.get_address.address}` }}</span>
               </el-form-item>
-              <el-form-item
+              <el-form-item label="所属信息:">
+                <template v-if="orderDetail.belong_user">
+                  <i class="el-icon-edit-outline cur" @click="getBelongUser" />
+                  <span>昵称: {{ orderDetail.belong_user && orderDetail.belong_user.nickname }}</span>
+                  <span>姓名: {{ orderDetail.belong_user && orderDetail.belong_user.realname }}</span>
+                  <span>手机号: {{ orderDetail.belong_user && orderDetail.belong_user.mobile }}</span>
+                </template>
+                <span v-else>该订单暂无所属者</span>
+              </el-form-item>
+              <!-- <el-form-item
                 v-if="orderDetail.get_address && (orderDetail.get_address.nickname || orderDetail.get_address.level)"
                 label=""
                 class="other_address"
               >
                 <span>收货人昵称: <span style="color:red">{{ orderDetail.get_address && orderDetail.get_address.nickname }}</span></span>
                 <span>收货人等级: <span style="color:red">{{ (orderDetail.get_address && orderDetail.get_address.level) | levelName }}</span></span>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="备注说明">
                 <div class="remark_container">
                   <i class="el-icon-edit-outline cur" @click="dialog.remark = true" />
@@ -143,15 +152,6 @@
                   <div v-else>无</div>
                 </div>
               </el-form-item>
-              <el-form-item label="所属者信息:">
-                <template v-if="orderDetail.belong_user">
-                  <i class="el-icon-edit-outline cur" @click="getBelongUser" />
-                  <span>昵称: {{ orderDetail.belong_user && orderDetail.belong_user.nickname }}</span>
-                  <span>姓名: {{ orderDetail.belong_user && orderDetail.belong_user.realname }}</span>
-                  <span>手机号: {{ orderDetail.belong_user && orderDetail.belong_user.mobile }}</span>
-                </template>
-                <span v-else>该订单暂无所属者</span>
-              </el-form-item>
               <el-form-item label="赠品信息">
                 <ul class="zengpin_list">
                   <li v-for="item in orderDetail.get_order_gift" v-show="item.pivot && item.pivot.num > 0" :key="item.id">

src/pages/team/zhengwei.vue

@@ -125,7 +125,7 @@
       </el-table-column>
     </el-table>
     <!-- 查看代理详情 -->
-    <el-drawer :title="`${memberInfo.realname} - ${levelStatus(memberInfo.level).name}`" :visible.sync="visible.memberInfo" direction="rtl" size="300px">
+    <el-drawer :title="`${memberInfo.realname} - ${levelStatus(memberInfo.level).name}`" :visible.sync="visible.memberInfo" direction="rtl" size="600px">
       <MemberInfo :info="memberInfo" :team-type="true" :show-num="roles.includes(6) || user.role_name === 'root'" @getOtherInfo="changeOtherInfo" />
     </el-drawer>
     <pagination