Merge branch 'dev4.5' of ssh://192.168.3.207:10022/qmx/jy into dev4.5

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -487,6 +487,23 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js'></script>
 <script>
+    window.jyUserPower = {
+      entniche: false,
+      member: false,
+      vip: 0
+    }
+    $.ajax({
+      url: '/publicapply/bidcoll/power',
+      type: 'POST'
+    }).done(function (r) {
+        if (r && r.error_msg == '' && r.data) {
+          window.jyUserPower = {
+            entniche: r.data.entniche,
+            member: r.data.member,
+            vip: r.data.vip
+          }
+        }
+    })
     var vKeepComponent = new Vue({
       delimiters: ['${', '}'],
       el: '#jyKeepComponent',

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -524,8 +524,9 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <area-component ref="areaComponent" @select="updateScrollTop" v-if="activeTabIndex === 2"></area-component>
-                                    <money-component ref="moneyComponent"  v-if="activeTabIndex === 3"></money-component>
+                                    <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 2"></area-component>
+                                    <money-component :radio="false" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 3"></money-component>
+                                    <area-component :multiple="false" ref="areaRadioComponent" @select="updateScrollTop" v-show="activeTabIndex === 6"></area-component>
                                 </div>
                                 <div class="pop-bottom" v-show="!isWaitBuy && isMoreSelect">
                                     <van-button type="default" @click="resetCondition">重置</van-button>

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -194,6 +194,15 @@ func (this *SubscribeChange) Upgrade() {
 			log.Println(userId+" 前台计算", req_price, "后台计算", final_price)
 			return &entity.FuncResult{false, errors.New(fmt.Sprintf("金额校验异常[%d,%d]", final_price, req_price)), nil}
 		}
+		order_status := 0
+		//老用户 0元升级
+		if req_price == 0 && 0 == final_price {
+			if oldBuyset.Upgrade == 0 {
+				order_status = 1
+			} else {
+				return &entity.FuncResult{false, errors.New("超级订阅升级异常"), nil}
+			}
+		}
 		//卡卷使用
 		userLotteryId, lotteryId := "", this.GetString("lotteryId")
 		full_price, reduce_price := 0, 0
@@ -232,11 +241,6 @@ func (this *SubscribeChange) Upgrade() {
 		if len(*infoList) != 0 {
 			disWord = fmt.Sprint((*infoList)[0]["password"])
 		}
-		order_status := 0
-		//老用户 0元升级
-		if req_price == 0 && 0 == final_price && oldBuyset.Upgrade == 0 {
-			order_status = 1
-		}
 		insertMap := map[string]interface{}{
 			"order_money":    final_price,
 			"order_status":   order_status,

src/web/staticres/common-module/collection/js/area-mobile.js

@@ -25,13 +25,18 @@ var areaComponentTemplate = `<div class="select-area-box j-container">
 var areaComponent = {
   name: 'area-mobile',
   template: areaComponentTemplate,
+  props: {
+    multiple: {
+      type: Boolean,
+      default: true
+    }
+  },
   data:function () {
     return {
       // 选择地区变量
       refresh: true,
       indexList:[],
       indexListMap:{},
-      multiple:true,
       // 原始数组
       provinceListMap: {
           '#': ['全国'],

src/web/staticres/common-module/collection/js/money-mobile.js

@@ -1,7 +1,7 @@
 var tempMoneyStyleComponent = `<style>
 .money-component-group {
   padding: 0 .32rem;
-  min-height: 4rem;
+  min-height: 5rem;
 }
 
 .money-component-group .van-field__control {
@@ -12,7 +12,8 @@ var tempMoneyStyleComponent = `<style>
 
 .money-component-group .select-tag-group {
   display: flex;
-  padding: .32rem 0;
+  padding-top: 0.36rem;
+  padding-bottom: 0.12rem;
   flex-wrap: wrap;
 }
 
@@ -97,15 +98,15 @@ var tempMoneyStyleComponent = `<style>
 var moneyComponentTemplate = `<div class="j-container">
 <div class="money-component-group j-main">
     <div class="select-tag-group">
-        <div class="select-tag-item" :class="{active:item.selected==true}" v-for="(item, index) in timeSelectList" :key="index" @click="selectFixedDate(item)">{{item.name}}</div>
+        <div class="select-tag-item" :class="{active:item.selected==true}" v-for="(item, index) in selectTags" :key="index" @click="selectFixedTag(item)">{{item.name}}</div>
     </div>
-    <div class="select-picker-group" @click="dateShowEvent" :class="{'click-active':dateStyle==true}">
-      <van-field type="digit" v-model="dateTimePickerState.startPlaceHolder" placeholder="请输入金额">
-        <template #extra><span class="extra-text-tip">万</span></template>
+    <div class="select-picker-group" @click="selectInput(false)" :class="{'click-active':inputSelected==true}">
+      <van-field :formatter="formatterDigit" @blur="formatInput" @click.stop="selectInput(true)" type="digit" v-model.number="inputMap.start" :placeholder="placeholder">
+        <template #extra><span class="extra-text-tip">{{extra}}</span></template>
       </van-field>
       <div class="line"></div>
-      <van-field type="digit" v-model="dateTimePickerState.endPlaceHolder" placeholder="请输入金额">
-        <template #extra><span class="extra-text-tip">万</span></template>
+      <van-field :formatter="formatterDigit" @blur="formatInput" @click.stop="selectInput(true)" type="digit" v-model.number="inputMap.end" :placeholder="placeholder">
+        <template #extra><span class="extra-text-tip">{{extra}}</span></template>
       </van-field>
     </div>
 </div>
@@ -121,233 +122,120 @@ var moneyComponentTemplate = `<div class="j-container">
 var moneyComponent = {
   name: 'money-mobile',
   template: moneyComponentTemplate,
+  props: {
+    radio: {
+      type: Boolean,
+      default: true
+    },
+    tags: {
+      type: Array,
+      default: function () {
+        return [
+          {
+            name: '不限',
+            value: '-',
+            selected: true
+          }
+        ]
+      }
+    },
+    placeholder: {
+      type: String,
+      default: '请输入金额'
+    },
+    extra: {
+      type: String,
+      default: '万'
+    }
+  },
   data:function () {
     return {
       colDate: 0,
-      timeSelectList:[
-        {
-          name: '不限',
-          value: 'all',
-          selected: true
-        },
-        {
-          name: '100万以内',
-          value: 'lately7',
-          selected: false
-        },
-        {
-          name: '100-500万',
-          value: 'lately30',
-          selected: false
-        },
-        {
-          name: '500-1000万',
-          value: 'lastYear',
-          selected: false
-        }
-      ],
+      selectTags: this.tags,
       // 点击选择时间添加样式
-      dateStyle: false,
-      // 时间选择参数
-      datePicker:{
-        startshow: false,
-        endshow: false,
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(),
-      },
-      dateTimePickerState: {
+      inputSelected: false,
+      inputMap: {
         start: '',
-        end: '',
-        startPlaceHolder: '', // 开始日期
-        endPlaceHolder: '' // 结束日期
-      },
+        end: ''
+      }
     }
   },
   mounted () {
     $('head').append(tempMoneyStyleComponent)
   },
   methods: {
-    setState (data) {
-      // {
-      //   start: 1620230400000, // 2021-5-6
-      //   end: 1620489600000, // 2021-5-9
-      //   exact: 'all'
-      // }
-      if (!data || Object.keys(data).length === 0) {
-        this.setTimeSelectListState('all')
-      } else {
-        switch (data.exact) {
-          case 'all': {
-            this.setTimeSelectListState('all')
-            this.clearDateTimePicker()
-            break
-          }
-          case 'lately7': {
-            this.setTimeSelectListState('lately7')
-            this.clearDateTimePicker()
-            break
-          }
-          case 'lately30': {
-            this.setTimeSelectListState('lately30')
-            this.clearDateTimePicker()
-            break
-          }
-          case 'lastYear': {
-            this.setTimeSelectListState('lastYear')
-            this.clearDateTimePicker()
-            break
-          }
-          case 'exact': {
-            // if (!data.start || !data.end) break
-            if (data.start < data.end) {
-              this.dateTimePickerState.start = new Date(data.start)
-              this.dateTimePickerState.end = new Date(data.end)
-            }
-            break
-          }
-          default: {
-            console.warn('exact值为空')
-          }
+    formatInput () {
+      if (String(this.inputMap.start).length && String(this.inputMap.end).length) {
+        var isEndMax = this.inputMap.start < this.inputMap.end
+        var maxN = isEndMax ? this.inputMap.end : this.inputMap.start
+        var minN = isEndMax ? this.inputMap.start : this.inputMap.end
+
+        this.inputMap = {
+          start: minN,
+          end: maxN
         }
       }
     },
-    clearDateTimePicker () {
-      this.dateTimePickerState.start = ''
-      this.dateTimePickerState.end = ''
+    formatterDigit (value) {
+      return value.replace(/\D/g, '').replace(/^0+/g, '0')
     },
     getState () {
-      // timeState.exact: all/lately7/lately30/lastYear/exact5种状态
-      // 为true时候表示精确筛选，从时间选择器中获取值(其他为根据当前时间计算出的值)
-      const timeState = {
-        start: '',
-        end: '',
-        exact: 'exact'
-      }
-      const selectButton = this.timeSelectList.find(item => item.selected)
-      console.log(selectButton)
-      if (selectButton) {
-        timeState.exact = selectButton.value
-        Object.assign(timeState, this.calcNotExactTime(timeState.exact))
-      } else {
-        timeState.exact = 'exact'
-        if(this.dateTimePickerState.start !== '') {
-          timeState.start = this.dateTimePickerState.start.getTime()
+      if (this.radio) {
+        if (this.inputSelected) {
+          return this.inputMap.start + '-' + this.inputMap.end
         } else {
-          timeState.start = ''
+          return this.selectTags.filter(v => v.selected)[0].value
         }
-        console.log(this.dateTimePickerState.end == '')
-        if(this.dateTimePickerState.end != '') {
-          timeState.end = this.dateTimePickerState.end.getTime()
-        } else {
-          timeState.end = ''
+      } else {
+        var resultList = []
+        if (this.inputSelected) {
+          resultList.push(this.inputMap.start + '-' + this.inputMap.end)
         }
+        this.selectTags.filter(v => v.selected).forEach(v => {
+          resultList.push(v.value)
+        })
+        return resultList.join(',')
       }
-      return timeState
     },
-    // 计算lately7/lately30/lastYear的开始和结束时间
-    // endTime传入一个时间戳
-    calcNotExactTime (exact, endTime = Date.now()) {
-      const t = {
-        start: 0,
-        end: +new Date(endTime)
-      }
-      const durations = {
-        hour1: 60 * 60 * 1000,
-        day1: 60 * 60 * 1000 * 24 * 1,
-        day7: 60 * 60 * 1000 * 24 * 7,
-        day30: 60 * 60 * 1000 * 24 * 30
-      }
-      switch (exact) {
-        case 'lately7': {
-          t.start = t.end - durations.day7
-          break
-        }
-        case 'lately30': {
-          t.start = t.end - durations.day30
-          break
-        }
-        case 'lastYear': {
-          const year = new Date(t.end).getFullYear()
-          const lastYear = year - 1
-          t.start = +new Date(`${lastYear}`)
-          t.end = +new Date(`${year}`) - durations.hour1 * 8 - 1
-          break
-        }
-        default: {
-          t.start = 0
-          t.end = 0
-          break
-        }
+    selectInput (type) {
+      if (this.radio) {
+        this.resetSelected()
+        this.inputSelected = true
+      } else {
+        this.inputSelected = type ? type : !this.inputSelected
       }
-      return t
     },
-    selectFixedDate: function(item) {
-      if (item.selected) return
-      this.timeSelectList.forEach(v => (v.selected = false))
-      item.selected = true
-      this.dateStyle = false
-      this.clearDateTimePicker()
-    },
-    // 显示选择时间弹窗
-    dateShowEvent: function() {
-      this.timeSelectList.forEach(v => (v.selected = false))
-      this.dateStyle = true
-      this.datePicker.startshow = true
-    },
-    formatter: function(type, val) {
-      if (type === 'year') {
-        return val + '年';
-      }
-      if (type === 'month') {
-        return val + '月';
-      }
-      if (type === 'day') {
-        return val + '日';
+    selectFixedTag: function(item) {
+      if (this.radio) {
+        if (item.selected) return
+        this.selectTags.forEach(v => (v.selected = false))
+        this.inputSelected = false
+        item.selected = true
+      } else {
+        item.selected = !item.selected
       }
-      return val;
     },
-    // 结束时间获取焦点
-    getEndFocus: function(){
-      this.datePicker.endshow = true
+    resetSelected () {
+      this.selectTags.forEach(v => (v.selected = false))
+      this.inputSelected = false
     },
     resetAll:function() {
+      this.resetSelected()
       let params = {
-        name: 'dateItem',
+        name: 'select-tag',
         data: ''
       }
       this.$emit('cancel', params)
-    },
-    // 选择开始时间弹窗确认按钮
-    onStartConfirm:function() {
-      this.dateTimePickerState.start = new Date(this.$refs.getstartValues.value)
-      this.dateTimePickerState.startPlaceHolder = this.$refs.getstartValues.value.pattern('yyyy年MM月dd日')
-      this.datePicker.startshow = false
-      // 如果结束时间不为空 选择过开始时间不弹出结束时间弹窗
-      if(this.dateTimePickerState.end == '') {
-        this.datePicker.endshow = true
-      }else{
-        this.datePicker.endshow = false
-      }
-    },
-    // 选择结束时间弹窗确认按钮
-    onendConfirm: function(){
-      this.dateTimePickerState.end = new Date(this.$refs.getendValues.value)
-      this.dateTimePickerState.endPlaceHolder = this.$refs.getendValues.value.pattern('yyyy年MM月dd日')
-      this.datePicker.endshow = false
-    },
-    // 选择时间弹窗关闭按钮
-    pickerClose: function() {
-      this.datePicker.startshow = false
-      this.datePicker.endshow = false
+      return params
     },
     // 筛选条件确认按钮
     onConfirm: function(){
       let params = {
-        name: 'dateItem',
+        name: 'select-tag',
         data: this.getState()
       }
       this.$emit('confirm', params)
+      return params
     }
   }
 }

src/web/staticres/common-module/ent-search/ent-search-template.css

@@ -450,99 +450,4 @@
   overflow: hidden !important;
 }
 
-.money-component-group {
-  padding: 0 .32rem;
-  min-height: 4rem;
-}
-
-.money-component-group .van-field__control {
-  font-size: .28rem;
-  color: #171826;
-  line-height: .4rem;
-}
-
-.money-component-group .select-tag-group {
-  display: flex;
-  padding: .32rem 0;
-  flex-wrap: wrap;
-}
-
-.money-component-group .select-tag-group .select-tag-item {
-  flex-shrink: 0;
-  min-width: 1.56rem;
-  height: .72rem;
-  background: #F5F6F7;
-  border-radius: .08rem;
-  color: #5F5E64;
-  font-size: .28rem;
-  text-align: center;
-  line-height: .72rem;
-  padding: 0 0.32rem;
-  margin: 0 .2rem .2rem 0;
-}
-
-.money-component-group .select-tag-group .select-tag-item.active {
-  position: relative;
-  background: #E8FAFD;
-  color: #2ABED1;
-}
-
-.money-component-group .select-tag-group .select-tag-item.active::after {
-  content: "";
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-  width: .28rem;
-  height: .28rem;
-  background-size: 100% 100%;
-}
-
-.money-component-group .select-picker-group {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: .16rem;
-  width: 100%;
-  height: 1.04rem;
-  opacity: 1;
-  background: #f5f6f7;
-  border-radius: .08rem;
-}
-
-.money-component-group .select-picker-group.click-active {
-  position: relative;
-  background: #E8FAFD;
-}
-
-.money-component-group .select-picker-group.click-active::after {
-  content: '';
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-  width: .28rem;
-  height: .28rem;
-  background-size: 100% 100%;
-}
-
-.money-component-group .select-picker-group .line {
-  width: 12px;
-  height: 1px;
-  background: #ACACAD;
-}
-
-.money-component-group .select-picker-group .van-cell.van-field {
-  width: 2.96rem;
-  height: .72rem;
-  background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-radius: .1rem;
-  align-items: center;
-}
-
-.money-component-group .extra-text-tip {
-  color: #9B9CA3;
-}
-
 /*# sourceMappingURL=ent-search-template.css.map */

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -10,6 +10,33 @@ var vEntSearchComponent = new Vue({
       showEntSearch: false,
       showPop: false,
       showUpTip: false,
+      moneyTags: [
+        {
+          name: '100万以内',
+          value: '0-100',
+          selected: false
+        },
+        {
+          name: '100-500万',
+          value: '100-500',
+          selected: false
+        },
+        {
+          name: '500-1000万',
+          value: '500-1000',
+          selected: false
+        },
+        {
+          name: '1000-5000万',
+          value: '1000-5000',
+          selected: false
+        },
+        {
+          name: '5000万以上',
+          value: '5000-',
+          selected: false
+        }
+      ],
       listInfo: {
         value: '',
         pageNum: 0,
@@ -19,6 +46,7 @@ var vEntSearchComponent = new Vue({
         finished: false
       },
       activeTabIndex: 0,
+      beforeTabIndex: 0,
       entTabs: [
         {
           title: ''
@@ -40,7 +68,7 @@ var vEntSearchComponent = new Vue({
         },
         {
           title: '中标区域',
-          disabled: true
+          disabled: false
         },
         {
           title: '单位类型'
@@ -236,6 +264,18 @@ var vEntSearchComponent = new Vue({
           }
           break
         }
+        case 3: {
+          var tempParams = {}
+          if (type) {
+            tempParams = this.$refs.moneyComponent.onConfirm()
+          } else {
+            tempParams = this.$refs.moneyComponent.resetAll()
+          }
+          if (tempParams && tempParams.data) {
+            this.conditionStrMap.entCapital = tempParams.data
+          }
+          break
+        }
         case 4 : {
           this.conditionStrMap.entType = this.getMoreListToStr(4)
           break
@@ -244,6 +284,18 @@ var vEntSearchComponent = new Vue({
           this.conditionStrMap.entStatus = this.getMoreListToStr(5)
           break
         }
+        case 6: {
+          var tempParams = {}
+          if (type) {
+            tempParams = this.$refs.areaRadioComponent.onConfirm()
+          } else {
+            tempParams = this.$refs.areaRadioComponent.resetAll()
+          }
+          if (tempParams && tempParams.data) {
+            this.conditionStrMap.biddingArea = tempParams.data[0]
+          }
+          break
+        }
         case 7 : {
           this.conditionStrMap.entClass = this.getMoreListToStr(7)
           break
@@ -377,7 +429,8 @@ var vEntSearchComponent = new Vue({
     },
     onClickTabs (name, title) {
       console.log(name, title)
-      this.togglePop(true)
+      this.togglePop(!(name === this.beforeTabIndex && this.showPop))
+      this.beforeTabIndex = name
     },
     onSelectItem (item, index) {
       if (index < 7) {

src/web/staticres/common-module/ent-search/ent-search-template.scss

@@ -406,89 +406,3 @@
 .ent-stop-scroll {
   overflow: hidden !important;
 }
-
-
-.money-component-group {
-  padding: 0 .32rem;
-  min-height: 4rem;
-
-  .van-field__control{
-    font-size: .28rem;
-    color: #171826;
-    line-height: .4rem;
-  }
-  .select-tag-group {
-    display: flex;
-    padding: .32rem 0;
-    flex-wrap: wrap;
-  }
-  .select-tag-group .select-tag-item{
-    flex-shrink: 0;
-    min-width: 1.56rem;
-    height: .72rem;
-    background: #F5F6F7;
-    border-radius: .08rem;
-    color: #5F5E64;
-    font-size: .28rem;
-    text-align: center;
-    line-height: .72rem;
-    padding: 0 0.32rem;
-    margin:0 .2rem .2rem 0;
-  }
-  .select-tag-group .select-tag-item.active{
-    position: relative;
-    background: #E8FAFD;
-    color: #2ABED1;
-  }
-  .select-tag-group .select-tag-item.active::after{
-    content: "";
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-    width: .28rem;
-    height: .28rem;
-    background-size: 100% 100%;
-  }
-  .select-picker-group{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: .16rem;
-    width: 100%;
-    height: 1.04rem;
-    opacity: 1;
-    background: #f5f6f7;
-    border-radius: .08rem;
-  }
-  .select-picker-group.click-active{
-    position: relative;
-    background: #E8FAFD;
-  }
-  .select-picker-group.click-active::after{
-    content: '';
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-    width: .28rem;
-    height: .28rem;
-    background-size: 100% 100%;
-  }
-  .select-picker-group .line{
-    width: 12px;
-    height: 1px;
-    background: #ACACAD;
-  }
-  .select-picker-group .van-cell.van-field {
-    width: 2.96rem;
-    height: .72rem;
-    background: #ffffff;
-    border: 1px solid rgba(0,0,0,0.10);
-    border-radius: .1rem;
-    align-items: center;
-  }
-  .extra-text-tip {
-    color: #9B9CA3;
-  }
-}