1

src/components/UserMan/addblindDateuser.vue

@@ -18,6 +18,9 @@
         </el-form-item>
         <el-form-item label="昵称" prop="Name">
           <el-input v-model="addMsg.Name" style="width:478px" size="small" ></el-input>
+        </el-form-item>
+         <el-form-item label="微信号" prop="WechatNo">
+          <el-input v-model="addMsg.WechatNo" style="width:478px" size="small" ></el-input>
         </el-form-item>
         <el-form-item label="上级">
           <el-select size="small" v-model="addMsg.SuperiorId" :filter-method="ChangeListName" filterable
@@ -92,6 +95,11 @@
             <template slot="append">万</template>
           </el-input>
         </el-form-item>
+         <el-form-item label="个人定位" >
+          <el-cascader v-model="position2" @change="gejigguan2" :placeholder="addressName2"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
+        </el-form-item>
+
+
         <el-form-item label="身份证正面"  size="small" >
           <el-button @click="openChangeDig(3)" size="small">选择文件</el-button>
           <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
@@ -257,8 +265,21 @@
           HopeYou:'',
           Appointment:'',
           AppointmentAddress:'',
+          WechatNo:'',
+          DWProvince:'',
+          DWCity:'',
+          DWDistrict:'',
+
+
         },
         rules: {
+          
+
+          WechatNo: [{
+            required: true,
+            message: '请输入微信号',
+            trigger: 'blur'
+          }],
           Photo: [{
             required: true,
             message: '请选择用户头像',
@@ -311,7 +332,9 @@
         HouseList:[],//房子情况
         CarInfoList:[],//车子情况
         position:[],
+        position2:[],
         addressName:'请选择籍贯',
+        addressName2:'请选择个人定位',
         provinceList: [],     //省市县列表
         props: {value: 'value', children: 'cities'},
 
@@ -522,6 +545,28 @@
             return
           }
         })
+      },
+      gejigguan2(val){
+          this.addMsg.DWProvince = val[0];
+          this.addMsg.DWCity = val[1];
+          this.addMsg.DWDistrict = val[2];
+          // this.provinceList.map(x=>{
+          //   if(x.value == val[0]){
+          //     this.addMsg.PName = x.label
+          //     x.cities.map(j=>{
+          //       if(j.value == val[1]){
+          //         this.addMsg.CName = j.label
+          //         j.cities.map(z=>{
+          //           if(z.value == val[2]){
+          //             this.addMsg.DName = z.label
+          //           }
+          //         })
+          //         return
+          //       }
+          //     })
+          //     return
+          //   }
+          // })
       }
 
 

src/components/UserMan/blindDateUsersList.vue

@@ -348,6 +348,7 @@
               >
             </button>
             <div v-show="scope.row.OpenIdState">{{ scope.row.OpenId }}</div>
+            <div v-if="scope.row.WechatNo!=''">微信号:{{scope.row.WechatNo}}</div>
           </template>
         </el-table-column>
         <el-table-column label="会员类型">
@@ -392,8 +393,22 @@
      
         <el-table-column prop="EducationTypeStr" label="学历"></el-table-column>
         <el-table-column prop="MarriageStr" label="婚姻"></el-table-column>
-        <el-table-column prop="HouseInfoStr" label="房产"></el-table-column>
-        <el-table-column prop="CarInfoStr" label="车产"></el-table-column>
+         <el-table-column prop="Age" label="资产" width="120">
+          <template slot-scope="scope">
+            <div>房产:{{scope.row.HouseInfoStr}}</div>
+            <div>车产:{{ scope.row.CarInfoStr }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="Age" label="是否认证" >
+          <template slot-scope="scope">
+            <!-- <span v-if="scope.row.BaseInfoId>0" style="color:#409EFF">认证</span>
+            <span v-if="scope.row.BaseInfoId==0" style="color:#F56C6C">未认证</span> -->
+            <el-tag  effect="dark" size="mini" v-if="scope.row.BaseInfoId>0">认证</el-tag>
+            <el-tag type="danger" size="mini" effect="dark" v-if="scope.row.BaseInfoId==0">未认证</el-tag>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="HouseInfoStr" label="房产"></el-table-column>
+        <el-table-column prop="CarInfoStr" label="车产"></el-table-column> -->
         <el-table-column prop="Number" label="星星点数" style="font-size: 11px">
           <template slot-scope="scope">
             <div>

src/components/UserMan/blindDateUsersListEdit.vue

@@ -14,6 +14,9 @@
         <el-form-item label="昵称">
           <el-input v-model="addMsg.Name" style="width:478px" size="small" ></el-input>
         </el-form-item>
+        <el-form-item label="微信号" prop="WechatNo">
+          <el-input v-model="addMsg.WechatNo" style="width:478px" size="small" ></el-input>
+        </el-form-item>
         <el-form-item label="会员等级">
           <el-select style="width:293px;" size="small" v-model="addMsg.MemberGrade" placeholder="请选择活动区域">
             <el-option label="普通用户" :value="0"></el-option>
@@ -107,6 +110,9 @@
           <el-input v-model="addMsg.YearMoney" style="width:478px" size="small" :min="0" type="number" placeholder="请输入年收入">
             <template slot="append">万</template>
           </el-input>
+        </el-form-item>
+         <el-form-item label="个人定位" >
+          <el-cascader v-model="position2" @change="gejigguan2" :placeholder="addressName2"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
         </el-form-item>
         <el-form-item label="身份证正面"  size="small" >
           <el-button @click="openChangeDig(3)" size="small">选择文件</el-button>
@@ -240,6 +246,13 @@
         value: '',
         total: 0,
         rules: {
+          WechatNo:[
+            {
+            required: true,
+            message: '请输入微信号',
+            trigger: 'blur'
+          }
+          ],
           Photo: [{
             required: true,
             message: '请选择用户头像',
@@ -297,8 +310,11 @@
         HouseList:[],//房子情况
         CarInfoList:[],//车子情况
         position:[],
+        position2:[],
         addressName:'请选择籍贯',
+        addressName2:'请选择个人定位',
         provinceList: [],     //省市县列表
+        provinceList2: [],     //省市县列表
         props: {value: 'value', children: 'cities'},
       };
     },
@@ -424,14 +440,22 @@
         }, res => {
           this.addMsg = res.data.data;
           this.msg.Name = this.addMsg.SuperiorName;
-          this.position =[res.data.data.Province,res.data.data.City,res.data.data.District]
-          this.addressName = res.data.data.PName+'/'+res.data.data.CName+'/'+res.data.data.DName
+          if(res.data.data.Province>0){
+            this.position =[res.data.data.Province,res.data.data.City,res.data.data.District]
+            this.addressName = res.data.data.PName+'/'+res.data.data.CName+'/'+res.data.data.DName
+          }
+          if(res.data.data.DWProvince>0){
+            this.position2 =[res.data.data.DWProvince,res.data.data.DWCity,res.data.data.DWDistrict]
+            this.addressName2 = res.data.data.DWPName+'/'+res.data.data.DWCName+'/'+res.data.data.DWDName
+          }
+          
           if(this.addMsg.AlbumList==null){
             this.addMsg.AlbumList=[]
           }
           if(this.addMsg.Age==''){
             this.addMsg.Age= 0
           }
+          this.getPosition(this.position2) //地址的请求
         })
       },
       getPosition(val, cb) {
@@ -509,6 +533,12 @@
           }
         })
       },
+      gejigguan2(val){
+          this.addMsg.DWProvince = val[0];
+          this.addMsg.DWCity = val[1];
+          this.addMsg.DWDistrict = val[2];
+        
+      },
       GetEducationTypeEnumList(){//学历
         this.apipost("/api/Miai/GetEducationTypeEnumList", {}, (res) => {
           this.EducationList = res.data.data;

src/components/UserMan/components/seeDetail.vue

@@ -12,7 +12,9 @@
           {{data[item.field] }}cm
         </el-form-item>
         <el-form-item :label="item.prop" v-if="item.type == 6">
-          {{data.PName}}-{{data.CName}}-{{data.DName}}
+          <span v-if="item.field =='NativePlace'">{{data.PName}}-{{data.CName}}-{{data.DName}}</span>
+          <span v-if="item.field =='DWPName'">{{data.DWPName}}-{{data.DWCName}}-{{data.DWDName}}</span>
+          
         </el-form-item>
         <el-form-item :label="item.prop" v-if="item.type == 7">
           {{data[item.field] }}w
@@ -53,6 +55,8 @@ export default {
     return {
       detailList: [
         //type:1.字符串，2.图片，3.数组
+        { prop: "微信号:", field: "WechatNo", type: 1 },
+        { prop: "手机号:", field: "Moblie", type: 1 },
         { prop: "昵称:", field: "RealName", type: 1 },
         { prop: "性别:", field: "SexStr", type: 1 },
         { prop: "出生日期:", field: "Birthday", type: 1 },
@@ -63,6 +67,7 @@ export default {
         { prop: "房产:", field: "HouseInfoStr", type: 1 },
         { prop: "车产:", field: "CarInfoStr", type: 1 },
         { prop: "年收入:", field: "YearMoney", type: 7 },
+        { prop: "个人定位:", field: "DWPName", type: 6 },
         { prop: "毕业学校:", field: "SchoolInfo", type: 1 },
 
         { prop: "工作单位:", field: "WorkUnit", type: 1 },

src/components/sallCenter/plugin/miaiuser.vue

@@ -418,11 +418,12 @@
           <el-form-item label="人数数量">
             <el-input v-model.number="data.goodsLength" type="number" min="1" max="30" size="small"></el-input>
           </el-form-item>
-          <el-form-item label="商品添加">
+          <el-form-item label="展示规则">
             <el-radio v-model="data.addUserType" :label="0">自定义</el-radio>
             <el-radio v-model="data.addUserType" :label="1">按照匹配度</el-radio>
             <el-radio v-model="data.addUserType" :label="2">按照热度</el-radio>
             <el-radio v-model="data.addUserType" :label="3">按照最新</el-radio>
+            <el-radio v-model="data.addUserType" :label="4">每日随机</el-radio>
           </el-form-item>
           <el-form-item label="性别">
             <el-radio v-model="data.sexType" :label="0">不限</el-radio>