Merge remote-tracking branch 'origin/dev' into dev

src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue

@@ -42,11 +42,23 @@ export default {
     };
   },
   onLoad() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     this.getList()
   },
   methods: {
     toAdd(row) {
-      uni.navigateTo({url: `./add?integralRuleId=${row.id}&integralRuleName=${row.eventName}`})
+      this.$instance.post(`/app/apppartyintegralrule/integralApply?integralId=${row.id}&partyId=${this.user.partyId}`).then(res => {
+        if (res.code == 0) {
+          uni.navigateTo({url: `./add?integralRuleId=${row.id}&integralRuleName=${row.eventName}`})
+        }else {
+          this.$u.toast(res.msg)
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
     },
     getList() {
       if(this.current > this.pages) return

src/project/sanjianxi/AppApplyPoint/add.vue

@@ -47,6 +47,10 @@ export default {
     };
   },
   onLoad(options) {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     this.integralRuleId = options.integralRuleId
     this.integralRuleName = options.integralRuleName
   },

src/project/sanjianxi/AppApplyPoint/detail.vue

@@ -75,6 +75,10 @@ export default {
     };
   },
   onLoad(options) {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     this.id = options.id
     this.$dict.load("integralDeclareStatus").then(() => {
       this.getDetail()

src/project/sanjianxi/AppApplyPoint/list.vue

@@ -56,6 +56,10 @@ export default {
     };
   },
   onLoad() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     this.getTypeList()
     this.$dict.load("integralDeclareStatus").then(() => {
       this.getList()

src/project/sanjianxi/AppPartyPoint/AppPartyPoint.vue

@@ -6,10 +6,10 @@
         <div class="flex">
           <div class="user">
             <img src="./img/user-img.png" alt=""> 
-            <span>王守义</span>
+            <span>{{user.realName}}</span>
           </div>
           <div class="point">
-            <h2>178</h2>
+            <h2>{{info.integral}}</h2>
             <p>累计获得积分</p>
           </div>
         </div>
@@ -22,11 +22,11 @@
     <div class="list">
       <div class="item border">
         <div>本月获得积分</div>
-        <div>30</div>
+        <div>{{info.nowMonthIntegral}}</div>
       </div>
       <div class="item">
-        <div>双山街道排名</div>
+        <div>{{info.partyOrgName}}排名</div>
-        <div>第11名</div>
+        <div>第{{info.orderIndex}}名</div>
       </div>
     </div>
     <div class="footer" @click="linkTo(`../AppApplyPoint/AppApplyPoint`)">
@@ -45,15 +45,26 @@ export default {
   },
   data() {
     return {
-
+      info: {}
     };
   },
   onLoad() {
-    
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
+    this.getDetail()
   },
   methods: {
     linkTo(url) {
       uni.navigateTo({ url })
+    },
+    getDetail() {
+      this.$instance.post(`/app/apppartyintegralinfo/integralInfoForWX?partyId=${this.user.partyId}`).then((res) => {
+        if (res.code == 0) {
+          this.info = res.data
+        }
+      });
     }
   }
 };

src/project/sanjianxi/AppPartyPoint/pointDetailList.vue

@@ -3,20 +3,21 @@
     <div class="fixed">
       <div class="header">
         <div class="left" @click="showDate=true">{{searchDate}}<u-icon name="arrow-down" color="#333" size="24" style="margin-left: 4px" ></u-icon></div>
-        <div class="right">获得积分 <span>1500</span></div>
+        <div class="right">获得积分 <span>{{integral}}</span></div>
       </div>
     </div>
     <div class="list">
-      <div class="item">
+      <div class="item" v-for="(item, index) in list" :key="index">
         <div class="left">
-          <h2>积分申报</h2>
+          <h2>{{ $dict.getLabel('partyIntegralDetailType', item.type) }}</h2>
-          <p>08-31 13:45</p>
+          <p v-if="item.createTime">{{item.createTime.substring(5, 16)}}</p>
         </div>
         <div class="right">
-          <h2 class="color-E6736E">＋20</h2>
+          <h2 :class="item.integralType == 1 ? 'color-E6736E' : 'color-F0A046'">{{item.integralType == 1 ? '+' : '-'}}{{item.integral}}</h2>
-          <p>疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控</p>
+          <p>{{item.remark}}</p>
         </div>
       </div>
+      <AiEmpty v-if="!list.length"/>
     </div>
     <u-picker mode="time" v-model="showDate" :params="dateParams" @confirm="selectDate"></u-picker>
   </div>
@@ -36,24 +37,64 @@ export default {
       showDate: false,
       dateParams: {
         year: true,
-        month: true,
+        month: false,
         day: false,
         hour: false,
         minute: false,
         second: false
       },
+      current: 1,
+      pages: 2,
+      list: [],
+      integral: 0
     };
   },
   onLoad() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     var datetime = new Date();
     var year = datetime.getFullYear();
     var month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
-    this.searchDate = `${year}-${month}`
+    this.searchDate = `${year}`
+    this.$dict.load("partyIntegralDetailType").then(() => {
+      this.getList()
+    })
   },
   methods: {
     selectDate(e) {
-      this.searchDate = `${e.year}-${e.month}`
+      this.searchDate = `${e.year}`
+      this.getListInit()
     },
+    getListInit() {
+      this.current = 1
+      this.pages = 2
+      this.list = []
+      this.integral = 0
+      this.getList()
+    },
+    getList() {
+      if (this.current > this.pages) return;
+      this.$instance.post(`/app/apppartyintegralinfo/integralDetailForWX`, null, {
+        params: {
+          partyId: this.user.partyId,
+          current: this.current,
+          year: this.searchDate,
+        }
+      }).then((res) => {
+        if (res.code == 0) {
+          this.integral = res.data.integral
+          const list = this.current > 1 ? [...this.list, ...res.data.infoIPage.records] : res.data.infoIPage.records
+          this.pages = res.data.infoIPage.pages
+          this.list = list
+        }
+      });
+    }
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
   }
 };
 </script>

src/project/sanjianxi/AppPartyPoint/pointRankingList.vue

@@ -56,6 +56,10 @@ export default {
     };
   },
   onLoad() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     uni.$on('selectParty', (res) => {
       this.partyName = res.name
       this.partyId = res.id
@@ -80,6 +84,23 @@ export default {
     },
     toSelect() {
       uni.navigateTo({url: './search'})
+    },
+    getList() {
+      if (this.current > this.pages) return;
+      this.$instance.post(`/app/apppartyintegralinfo/integralDetailForWX`, null, {
+        params: {
+          partyId: this.user.partyId,
+          current: this.current,
+          year: this.searchDate,
+        }
+      }).then((res) => {
+        if (res.code == 0) {
+          this.integral = res.data.integral
+          const list = this.current > 1 ? [...this.list, ...res.data.infoIPage.records] : res.data.infoIPage.records
+          this.pages = res.data.infoIPage.pages
+          this.list = list
+        }
+      });
     }
   }
 };

src/project/sanjianxi/AppPartyPoint/search.vue

@@ -35,6 +35,10 @@ export default {
     };
   },
   onLoad() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#E76056",
+    })
     this.historyList = uni.getStorageSync("historyList")
   },
   methods: {