Browse Source

refactor:新增交易类型,修改获取公告参数

zhanghui 2 năm trước cách đây
mục cha
commit
ccf7ba21fd

+ 7 - 6
myPages/transactionRecord/index.vue

@@ -1,9 +1,8 @@
 <template>
     <view class="page">
-        <u-sticky  :disabled="isSticky">
+        <u-sticky>
             <View class=" tabs">
-                <u-tabs :list="tabList" :scrollable="false"
-                        lineWidth="30"
+                <u-tabs :list="tabList"
                         lineColor="#FFE05C"
                         :activeStyle="{
             					color: '#333333',
@@ -24,7 +23,7 @@
                 </picker>
 
                 <view class="right flex-row justify-around">
-                    <text>储值¥{{tranFlowstatistic.rechargeAmount || 0}}</text>
+                    <text>新增¥{{tranFlowstatistic.rechargeAmount || 0}}</text>
                     <text>消费-¥{{tranFlowstatistic.consumeAmount || 0 }}</text>
                     <text>退款-¥{{tranFlowstatistic.refundAmount || 0 }}</text>
                 </view>
@@ -63,9 +62,11 @@
                 }, {
                     name: '消费'
                 }, {
-                    name: '储值',
+                    name: '新增',
                 }, {
-                    name: '退款'
+                    name: '微信退款'
+                }, {
+                    name: '余额退款'
                 }],
 
                 serviceTimeShow: false,

+ 4 - 3
myPages/transactionRecord/module/mescrollUni-item.vue

@@ -12,9 +12,10 @@
 			<view class="item" v-for="(item,index) in list" :key="index">
 				<view class="flex-row justify-between" @click="goOrderDetail(item)">
 					<view class="leftText" :class="{'backColor1':item.tradeNoType == '1','backColor2':item.tradeNoType == '2','backColor3':item.tradeNoType == '3'}">
-						<text v-if="item.tradeNoType == '1'">消费</text>
-						<text v-if="item.tradeNoType == '2'">充值</text>
-						<text v-if="item.tradeNoType == '3'">退款</text>
+						<text v-if="item.tradeNoType == '1'">减少</text>
+						<text v-if="item.tradeNoType == '2'">新增</text>
+						<text v-if="item.tradeNoType == '3'">减少</text>
+						<text v-if="item.tradeNoType == '4'">增加</text>
 					</view>
 					<view class="rightText flex-col">
 						<view class=" flex-row justify-between">

+ 1 - 1
orderPages/serviceItems/index.vue

@@ -109,7 +109,7 @@
                             <u-icon name="/static/me/u694.png" color="#666" size="40"></u-icon>
                         </view>
                         <view class="imageText flex-row justify-center">
-                            <text>权益券</text>
+                            <text>88卡用户</text>
                         </view>
                     </view>
 

+ 3 - 2
pages/index/index.vue

@@ -446,9 +446,10 @@ export default {
     getNoticeListData() {
       let req = {
         auth: true,
-        noticeType: 2
+        noticeType: 2,
+        status:0
       }
-      this.$api.noticeList({data: req}).then((res) => {
+      this.$api.noticeList(req).then((res) => {
         if (res.data.rows.length === 1) {
           this.noticeList.push(res.data.rows[0])
           this.noticeList.push(res.data.rows[0])