Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !115

src/components/pickArea/index.vue

@@ -33,6 +33,22 @@
       <template #cancel>
         <div class="picker-area-buttons" />
       </template>
+      <template #columns-bottom>
+        <div class="picker-area-bottom">
+          <div
+            class="area-bottom-left"
+            @click="close"
+          >
+            取消
+          </div>
+          <div
+            class="area-bottom-right"
+            @click="sbumit"
+          >
+            确定
+          </div>
+        </div>
+      </template>
     </van-picker>
   </van-popup>
 </template>
@@ -65,7 +81,8 @@ export default {
       cityList: [],
       countyList:[],
       loading: true,
-      result:null
+      result: null,
+      values:[]
     };
   },
   watch: {
@@ -103,6 +120,13 @@ export default {
     this.result = store.get('geolocation');
   },
   methods: {
+    // 提交
+    sbumit() {
+      const values = this.$refs.picker.getValues();
+      console.log('sbumit', values);
+
+      this.$emit('confirm', values);
+    },
     // 初始化 省市县信息
     async initData() {
       this.provinceList = await this.getProvinceList();
@@ -116,6 +140,7 @@ export default {
         this.$emit('confirm', data);
       }
     },
+
     // 获取省列表
     getProvinceList() {
       const datas = {projectEquityNo:this.projectEquityNo};
@@ -184,7 +209,7 @@ export default {
     // 确定按钮
     confirm(value, valueIndex) {
       console.log(value, valueIndex);
-      this.$emit('confirm', value);
+      // this.values = value;
       this.$emit('close', 'showArea');
     },
     // 滑动选择的change
@@ -242,4 +267,32 @@ export default {
   align-items: center;
   color: #999999;
 }
+.picker-area-bottom{
+
+  height: 49px;
+  padding:5px 12px 21px 12px;
+  display: flex;
+  justify-content: space-between;
+  box-shadow: inset 0px 1px 0px 0px #E9E9E9;
+
+}
+.area-bottom-left,.area-bottom-right{
+  width: 170px;
+  height: 40px;
+  border-radius: 20px;
+  font-size: 16px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 40px;
+  text-align: center;
+}
+.area-bottom-left{
+  border: 1px solid #C0C0C0;
+  color: #212121;
+
+}
+.area-bottom-right{
+  background: #00BDA5;
+  color: #fff;
+}
 </style>