积分兑换

src/project/pidu/AppPointsChange/AppPointsChange.vue

@@ -13,35 +13,24 @@
     </AiTopFixed>
     <div class="list-content">
       <div class="select">
-        <div class="active">最新上架</div>
+        <div :class="search.newStatus == 1 ? 'active' : ''" @click="clickNew()">最新上架</div>
-        <div class="price active">价格<span class="top active">⏶</span><span class="bottom">⏷</span></div>
+        <div class="price active" @click="clickPrice()">价格<span class="top" :class="search.priceStatus == 1 ? 'active' : ''">⏶</span><span class="bottom" :class="search.priceStatus != 1 ? 'active' : ''">⏷</span></div>
-        <div class="sure active">可兑换的
+        <div class="sure" :class="search.status == 2 ? 'active' : ''" @click="clickStatus()">可兑换的
-          <img src="./components/imgs/check-icon.png" alt="">
+          <img src="./components/imgs/check-icon.png" alt="" v-if="search.status == 2">
         </div>
       </div>
       <div class="type">
         <div class="type-item" :class="index == typeIndex ? 'active' : ''" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">{{item}}</div>
       </div>
-      <div class="item" @click="toDetail()">
+      <div class="item" :class="item.status != 0 ? 'lack-item' : ''" v-for="(item, index) in list" :key="index" @click="toDetail()">
         <div class="left">
-          <img src="./components/imgs/check-icon.png" alt="">
+          <img :src="item.imageUrl" alt="">
         </div>
         <div class="right">
-          <p>天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾可湿水天薇抽纸天然无香纸巾可湿水</p>
+          <p>{{item.merchandiseName}}</p>
-          <h3>10<span>积分</span></h3>
+          <h3>{{item.merchandiseIntegral}}<span>积分</span></h3>
-
         </div>
-      </div>
+        <img src="./components/imgs/lack-icon.png" alt="" class="status" v-if="item.status != 0"/>
-      <div class="item lack-item">
-        <div class="left">
-          <img src="./components/imgs/check-icon.png" alt="">
-        </div>
-        <div class="right">
-          <p>天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾可湿水天薇抽纸天然无香纸巾可湿水</p>
-          <h3>10<span>积分</span></h3>
-
-        </div>
-        <img src="./components/imgs/lack-icon.png" alt="" class="status" />
       </div>
     </div>
     <!-- <AiEmpty v-else></AiEmpty> -->
@@ -58,29 +47,36 @@ export default {
     return {
       current: 1,
       list: [],
-      typeList: ['全部', '100分以下', '500分以下', '1000分以下', '5000分以下', '10000分以下'],
+      typeList: ['全部', '100分以下', '500分以下', '1000分以下', '5000分以下'],
-      typeIndex: 0
+      typeIndex: 0,
+      search: {
+        status: '',
+        newStatus: '',
+        priceStatus: '1'
+      }
+
     }
   },
   computed: {
     ...mapState(['user']),
   },
   onLoad() {
-    // this.getList()
+    this.getList()
-    // uni.$on('reload', () => {
+    uni.$on('reload', () => {
-    //   this.getListInit()
+      this.getListInit()
-    // })
+    })
   },
   onShow() {
     document.title = '积分兑换'
   },
   methods: {
     getList() {
-      this.$http.post('/app/apppartyintegralinfo/list', null, {
+      this.$http.post('/app/appintegralmerchandise/listByGirdMember', null, {
         params: {
+          ...this.search,
           size: 20,
           current: this.current,
-          partyName: this.partyName
+          queryIntegralType: this.typeIndex
         },
       })
       .then((res) => {
@@ -102,7 +98,19 @@ export default {
     },
     toMyOrder() {
       uni.navigateTo({url:`./myOrder`})
-    }
+    },
+    clickStatus() {
+      this.search.status = this.search.status == 2 ? '' : 2
+      this.getListInit()
+    },
+    clickNew() {
+      this.search.newStatus = this.search.newStatus == 1 ? '' : 1
+      this.getListInit()
+    },
+    clickPrice() {
+      this.search.priceStatus = this.search.priceStatus == 1 ? '' : 1
+      this.getListInit()
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/project/pingchang/AppCommunityManagement/Edit.vue

@@ -9,7 +9,7 @@
             <span class="tips">*</span>身份证号
           </div>
           <div class="value">
-            <u-input placeholder="请输入" type="idcard" input-align="right" height="32" maxlength="18" v-model="form.idNumber" :custom-style="{'font-size': '17px'}"  @blur="idNumberChange" />
+            <input placeholder="请输入" type="idcard" input-align="right" height="32" maxlength="18" v-model="form.idNumber" placeholder-style="font-size: 16px;color: #999;" :custom-style="{'font-size': '17px'}"  @blur="idNumberChange" />
           </div>
         </div>
         <div class="item solid">
@@ -49,7 +49,7 @@
           <div class="value">
             <AiAreaPicker v-model="form.startAreaId" all @select="areaSelectStart" :fullName.sync="form.startAreaName" style="color: #666">
               <span style="margin-left: 4px" v-if="form.startAreaName">{{ form.startAreaName }}</span>
-              <span v-else>请选择</span>
+              <span v-else class="color-999">请选择</span>
               <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
             </AiAreaPicker>
           </div>
@@ -103,7 +103,7 @@
           <div class="value">
             <AiAreaPicker v-model="form.arriveAreaId" :areaId="cropAreaId" @select="areaSelectArrive" :name.sync="form.arriveAreaName" style="color: #666" selectRoot>
               <span style="margin-left: 4px" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
-              <span v-else>请选择</span>
+              <span v-else class="color-999">请选择</span>
               <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
             </AiAreaPicker>
           </div>

src/project/pingchang/AppCommunityManagement/HandleDetail.vue

@@ -18,7 +18,7 @@
       <div class="item-flex">
         <div class="label">身份证号</div>
         <div class="value">
-          <u-input v-if="isIdNumberInput" type="idcard" input-align="right" height="32" maxlength="18" v-model="info.idNumber" :custom-style="{'font-size': '17px'}"  />
+          <input v-if="isIdNumberInput" type="idcard" input-align="right" height="32" maxlength="18" v-model="info.idNumber" :custom-style="{'font-size': '17px'}"  />
           <span v-else>{{info.idNumberText}}</span>
         </div>
       </div>

src/project/pingchang/AppCommunityManagement/ManageDetail.vue

@@ -158,7 +158,7 @@
             <span class="tips">*</span>身份证号
           </div>
           <div class="value">
-            <u-input input-align="right" height="32" maxlength="18" v-model="info.idNumber" :custom-style="{'font-size': '17px'}" />
+            <input input-align="right" height="32" maxlength="18" v-model="info.idNumber" :custom-style="{'font-size': '17px'}" />
           </div>
         </div>
         <div class="item solid">