update

src/pages/buy/components/BuyPopup.vue

@@ -23,7 +23,7 @@
           </div>
         </template>
       </van-field>
-      <van-field v-for="item in fieldsMap" v-model="form[item.key]" :key="item.key" :name="item.key" :label="item.label" :type="item.type" :rules="[{ required: item.required, message: '请输入留言' }, { validator: item.validator, message: item.errorMsg || '输入格式有误' }]"/>
+      <van-field v-for="item in fieldsMap" v-model="form[item.key]" :key="item.key" :name="item.key" :label="item.label" :type="item.type" :placeholder="item.placeholder" :rules="[{ required: item.required, message: '请输入留言' }, { validator: item.validator, message: item.errorMsg || '输入格式有误' }]"/>
       <div style="margin: 16px;">
         <van-button type="primary" round block color="#C01540" size="small">下一步</van-button>
       </div>
@@ -172,28 +172,35 @@ export default {
           label: item.filed,
           key: 'field_' + index,
           required: item.required,
-          type: 'text'
+          type: 'text',
+          placeholder: '请填写留言'
         }
         this.$set(this.form, field.key, '')
+        field.placeholder = '请填写留言'
         if (item.type === 'text' && item.multiple) {
           field.type = 'textarea'
         } else if (['email', 'phone', 'id'].includes(item.type)) {
           field.validator = this.validatorMap[item.type]
+          field.placeholder = '请填写邮箱'
           let errorMsg = '邮箱格式有误'
           if (item.type === 'phone') {
             field.type = 'tel'
             errorMsg = '手机格式有误'
+            field.placeholder = '请填写手机号'
           } else if (item.type === 'id') {
             field.type = 'text'
             errorMsg = '身份证格式有误'
+            field.placeholder = '请填写身份证号'
           }
           field.errorMsg = errorMsg
         } else if (item.type === 'number') {
           field.type = 'number'
+          field.placeholder = '请填写身份证号'
         }
         fieldsMap[field.key] = field
       })
       this.fieldsMap = fieldsMap
+      console.log('field', fieldsMap)
     },
     fetchGoodsSpecs() {
       const params = {

src/pages/buy/index.vue

@@ -73,7 +73,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['user', 'isWxBrowser']),
+    ...mapGetters(['user', 'isPhone', 'isWxBrowser']),
     query() {
       return this.$route.query
     },
@@ -110,6 +110,10 @@ export default {
       this.$router.push({ path: '/shop', query: { shop_id: id } })
     },
     async handleBuy() {
+      // if (!this.isPhone) {
+      //   Toast.fail('只支持在手机端购买')
+      //   return
+      // }
       const isLogin = store.state.isLogin || (await store.dispatch('checkLogin'))
       if (isLogin) {
         // if (this.isWxBrowser) {

src/pages/home/index.vue

@@ -14,7 +14,27 @@
       <van-swipe-item>3</van-swipe-item>
       <van-swipe-item>4</van-swipe-item>
     </van-swipe> -->
-    <ul class="goods-list">
+    <van-list
+      v-model="loading"
+      class="goods-list"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
+      <div class="goods-item" v-for="item in goodsList" :key="item.id" @click="handleClick(item)">
+        <div class="thumb">
+          <img :src="imgJsonParse(item.chart_oss)">
+        </div>
+        <div class="content">
+          <div class="top">
+            <div class="price">￥<span>{{item.price_zone}}</span></div>
+            <div class="right-tag">{{item.sales_volume}}人付款</div>
+          </div>
+          <p class="title van-ellipsis">{{item.spu_name}}</p>
+        </div>
+      </div>
+    </van-list>
+    <ul class="goods-list" v-if="false">
       <li class="goods-item" v-for="item in goodsList" :key="item.id" @click="handleClick(item)">
         <div class="thumb">
           <img :src="imgJsonParse(item.chart_oss)">
@@ -40,7 +60,12 @@ export default {
   data() {
     return {
       search: '',
-      goodsList: []
+      goodsList: [],
+      loading: false,
+      finished: false,
+      refreshing: false,
+      page_size: '20',
+      page: '1'
     }
   },
   computed: {
@@ -69,6 +94,9 @@ export default {
         return ''
       }
     },
+    goodsListLoad() {
+      this.fetchGetList()
+    },
     fetchGetList() {
       const params = {
         shop_id: this.shop_id,
@@ -76,7 +104,9 @@ export default {
         spu_name: this.search,
         status: '2'
       }
+      this.loading = true
       getGoodsList(params).then(res => {
+        this.loading = false
         if (res.code === 0 && res.msg === '成功') {
           this.goodsList = res.data
         } else {

src/pages/order/index.vue

@@ -153,6 +153,7 @@ export default {
       const params = {
         customer_id: this.user.id,
         order_status: this.active,
+        spu_name: this.search,
         page_size: '20'
       }
       getOrderList(params).then(res => {