linwenxin 2 minggu lalu
induk
melakukan
59001397a9

+ 100 - 92
src/packageHome/pages/codeActivity/activityList.vue

@@ -1,127 +1,135 @@
 <template>
-  <zj-page-layout :hasFooter="true"
+  <zj-page-layout
+    :hasFooter="true"
     :isScroll="true"
     :refresherTriggered="refresherTriggered"
-    @refresherrefresh="refresherrefresh">
+    @refresherrefresh="refresherrefresh"
+  >
     <template slot="header">
       <view class="tab-container">
-      	<u-tabs
-      		:scrollable="false"
-      		:list="tabList"
-      		:current="tabCurrent"
-      		@click="changeTab"
-      		lineColor="#3D8FFD"
-      		:activeStyle="{
-      			color: '#3D8FFD'
-      		}"
-      		:inactiveStyle="{
-      			color: '#666666'
-      		}"
-      		itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;">
-      	</u-tabs>
+        <u-tabs
+          :scrollable="false"
+          :list="tabList"
+          :current="tabCurrent"
+          @click="changeTab"
+          lineColor="#3D8FFD"
+          :activeStyle="{
+            color: '#3D8FFD'
+          }"
+          :inactiveStyle="{
+            color: '#666666'
+          }"
+          itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;"
+        >
+        </u-tabs>
       </view>
     </template>
 
     <view class="list-container">
       <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toForm(item)">
-        <image v-if="item.detailImgs" :src="(item.detailImgs.split(','))[0]" mode="aspectFill"></image>
+        <image v-if="item.detailImgs" :src="item.detailImgs.split(',')[0]" mode="aspectFill"></image>
         <view class="main">
-          <view class="title">{{item.name}}</view>
-          <view class="text" v-if="item.startTime && item.endTime">{{item.startTime.slice(0, 10)}} 至 {{item.endTime.slice(0, 10)}}</view>
+          <view class="title">{{ item.name }}</view>
+          <view class="text" v-if="item.startTime && item.endTime"
+            >{{ item.startTime.slice(0, 10) }} 至 {{ item.endTime.slice(0, 10) }}</view
+          >
         </view>
         <text class="iconfont icon-jinru"></text>
       </view>
     </view>
-	<template slot="footer">
-		<view class="footer-btn-group">
-		  <u-button text="报名记录" @tap="toList"></u-button>
-		</view>
-	</template>
+    <template slot="footer">
+      <view class="footer-btn-group">
+        <u-button text="报名记录" @tap="toList"></u-button>
+      </view>
+    </template>
     <Loading :type="2" :loadStatus="loadStatus" :dataList="dataList" />
-
   </zj-page-layout>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-		dataList: [],
-		pageNum: 1,
-		loadStatus: 0,
-        refresherTriggered: false,
-        tabList: [
-          {name: '进行中', value: 1},
-          {name: '已过期', value: 2},
-          // {name: '我参与的', value: 9},
-        ],
-        tabCurrent: 0,
-        status: '',
-      }
-    },
+export default {
+  data() {
+    return {
+      dataList: [],
+      pageNum: 1,
+      loadStatus: 0,
+      refresherTriggered: false,
+      tabList: [
+        { name: '进行中', value: 1 },
+        { name: '已过期', value: 2 }
+        // {name: '我参与的', value: 9},
+      ],
+      tabCurrent: 0,
+      status: ''
+    }
+  },
 
-    onLoad({tab = 1}) {
-      this.status = tab;
-      this.tabCurrent = this.tabList.map(o => o.value).indexOf(tab);
+  onLoad({ tab = 1 }) {
+    this.status = tab
+    this.tabCurrent = this.tabList.map(o => o.value).indexOf(tab)
 
-      this.getList();
-    },
+    this.getList()
+  },
 
-    methods: {
-      getList() {
-      	this.loadStatus = 1;
-      	this.$api.post('/promotion/questionnaire/list', {
-          status: this.status,
-      	}).then(res => {
-      		this.loadStatus = 0;
-      		let list = res.data;
-      		if (list.length < 1) {
-      		  this.loadStatus = 2;
-      		}
-      		this.dataList = res.data;
-      	}).catch(() => {
-      		this.loadStatus = 2;
-      	}).finally(res => {
-      		this.refresherTriggered = false;
-      	})
-      },
+  methods: {
+    getList() {
+      this.loadStatus = 1
+      this.$api
+        .post('/promotion/questionnaire/list', {
+          status: this.status
+        })
+        .then(res => {
+          this.loadStatus = 0
+          let list = res.data
+          if (list.length < 1) {
+            this.loadStatus = 2
+          }
+          this.dataList = res.data
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
+    },
 
-      changeTab(e) {
-      	this.tabCurrent = e.index;
-      	this.status = e.value;
-        this.refreshList();
-      },
+    changeTab(e) {
+      this.tabCurrent = e.index
+      this.status = e.value
+      this.refreshList()
+    },
 
-      refreshList() {
-      	this.dataList = [];
-      	this.pageNum = 1;
-      	this.getList();
-      },
+    refreshList() {
+      this.dataList = []
+      this.pageNum = 1
+      this.getList()
+    },
 
-      // 触发下拉刷新
-      refresherrefresh(e) {
-      	this.refresherTriggered = true;
-      	this.refreshList();
-      },
+    // 触发下拉刷新
+    refresherrefresh(e) {
+      this.refresherTriggered = true
+      this.refreshList()
+    },
 
-      toForm(item) {
-        this.$navToPage({
-          url: `/packageHome/pages/codeActivity/activityForm?id=${item.id}`
-        })
-      },
-	  
-	  toList() {
-	    this.$navToPage({
-	      url: `/packageHome/pages/codeActivity/applyList?id=`
-	    })
-	  },
+    toForm(item) {
+      this.$navToPage({
+        url: `/packageHome/pages/codeActivity/activityForm?id=${item.id}`
+      })
     },
+
+    toList() {
+      this.$navToPage({
+        url: `/packageHome/pages/codeActivity/applyList?id=`
+      })
+    }
   }
+}
 </script>
 
 <style lang="scss" scoped>
 .tab-container {
-  background: #FFFFFF;
+  background: #ffffff;
 }
 
 .list-container {
@@ -133,7 +141,7 @@
     padding: 30rpx;
     display: flex;
     align-items: center;
-	box-sizing: border-box;
+    box-sizing: border-box;
     image {
       width: 160rpx;
       height: 120rpx;

+ 1 - 1
src/packageMaterial/pages/newSale/orderDetail.vue

@@ -73,7 +73,7 @@
         <view class="bottom-container" v-if="detail.payStatus == 'WAIT'">
           <view class="left"></view>
           <view class="right">
-            <u-button text="取消订单" @click="cancelOrder"></u-button>
+            <u-button v-if="detail.ifCancel" text="取消订单" @click="cancelOrder"></u-button>
             <u-button
               text="去收款"
               type="primary"

+ 1 - 1
src/packageMaterial/pages/newSale/orderList.vue

@@ -81,7 +81,7 @@
           <view class="value price">{{ item.totalAmount | priceFilter }}元</view>
         </view>
         <view class="btns" v-if="item.payStatus == 'WAIT'" @tap.stop>
-          <u-button text="取消订单" @click="cancelOrder(item)"></u-button>
+          <u-button v-if="item.ifCancel" text="取消订单" @click="cancelOrder(item)"></u-button>
           <u-button
             text="去收款"
             type="primary"

+ 1 - 1
src/packageMaterial/pages/sale/orderDetail.vue

@@ -72,7 +72,7 @@
         <view class="bottom-container" v-if="detail.payStatus == 'WAIT'">
           <view class="left"></view>
           <view class="right">
-            <u-button text="取消订单" @click="cancelOrder"></u-button>
+            <u-button v-if="detail.ifCancel" text="取消订单" @click="cancelOrder"></u-button>
             <u-button
               text="去收款"
               type="primary"

+ 1 - 1
src/packageMaterial/pages/sale/orderList.vue

@@ -81,7 +81,7 @@
           <view class="value price">{{ item.totalAmount | priceFilter }}元</view>
         </view>
         <view class="btns" v-if="item.payStatus == 'WAIT'" @tap.stop>
-          <u-button text="取消订单" @click="cancelOrder(item)"></u-button>
+          <u-button v-if="item.ifCancel" text="取消订单" @click="cancelOrder(item)"></u-button>
           <u-button
             text="去收款"
             type="primary"