Merge branch 'writeoff' into all

src/pages/write_off/mall/list/list.vue

@@ -3,35 +3,35 @@
         <view class="mol-date">
             <view class="md-txt">核销日期</view>
             <view class="md-picker">
-                <picker>
+                <picker mode="date" @change="stChange">
                     <view>
-                        <input :value="'2019-05-17'" />
+                        <input :value="startTime" disabled placeholder="请选择时间" />
                         <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
                     </view>
                 </picker>
             </view>
             <view class="md-txt">至</view>
             <view class="md-picker">
-                <picker>
+                <picker mode="date" @change="edChange">
                     <view>
-                        <input :value="'2019-05-17'" />
+                        <input :value="endTime" disabled placeholder="请选择时间" />
                         <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
                     </view>
                 </picker>
             </view>
         </view>
         <view class="mol-list">
-            <view class="ml-item" v-for="i in 5" :key="i">
+            <view class="ml-item" v-for="(e, i) in writeOffList" :key="i">
                 <view class="mi-order-no">
-                    <view class="mon-num">订单编号：20195171564566</view>
-                    <view class="mon-btn">复制</view>
+                    <view class="mon-num">订单编号：{{ e.product_order_no || '-' }}</view>
+                    <view class="mon-btn" @click="copyBtn(e.product_order_no || '-')">复制</view>
                 </view>
                 <view class="mi-info">
-                    <view class="mi-line">取货码：200801108978</view>
-                    <view class="mi-line">取货人：梁小姐 18316553857</view>
-                    <view class="mi-line">商品：运动服（M)x1 ；运动服（M)x2</view>
-                    <view class="mi-line">核验人：李小雨</view>
-                    <view class="mi-line">取货时间：2019-05-17 11:12:58</view>
+                    <view class="mi-line">取货码：{{ e.product_order_no || '-' }}</view>
+                    <view class="mi-line">取货人：{{ e.product_order_self_pickup_info.name || '-' }} {{ e.product_order_self_pickup_info.phone || '-' }}</view>
+                    <view class="mi-line">商品：{{ e.product_order_goods.join('；') }}</view>
+                    <view class="mi-line">核验人：{{ e.optuname }}</view>
+                    <view class="mi-line">取货时间：{{ e.created_at || '-' }}</view>
                 </view>
             </view>
         </view>
@@ -43,11 +43,81 @@
 </template>
 
 <script>
+import { API } from '../../../../js/api';
+import { servers } from '../../../../js/server';
 import util from '../../../../utils/util';
+import { mapState } from 'vuex';
 export default {
+    computed: {
+        ...mapState([ 'brandInfo' ]),
+        
+    },
+    data(){
+        return {
+            writeOffList: [],
+            page: 1,
+            startTime: '',
+            endTime: '',
+
+        }
+    },
+    onReachBottom(){
+        let { brandInfo, startTime, endTime, page } = this;
+        this.getList({
+            brand_id: brandInfo.brand.id,
+            stime: startTime || '',
+            etime: endTime || '',
+            page: ++page
+        })
+    },  
+    onLoad(){
+        this.refreshPage();
+    },
     methods: {
+        refreshPage(){
+            let { brandInfo, startTime, endTime } = this;
+            this.page = 1;
+            this.writeOffList = [];
+            this.$nextTick(_=>{
+                this.getList({
+                    brand_id: brandInfo.brand.id,
+                    stime: startTime || '',
+                    etime: endTime || '',
+                })
+            })
+        },
+        copyBtn(data){
+            uni.setClipboardData({ data })
+        },
+        stChange(e){
+            console.warn(e)
+            this.startTime = e.detail.value;
+            this.$nextTick(_=>this.refreshPage());
+        },
+        edChange(e){
+            this.endTime = e.detail.value;
+            this.$nextTick(_=>this.refreshPage());
+        },
         toOperate(){
-            util.routeTo(`/pages/write_off/operate/operate`, 'nT');
+            util.routeTo(`/pages/write_off/operate/operate?type=mall`, 'nT');
+        },
+        getList({ brand_id,  page = 1, page_size = 15, stime = '', etime = '' }){
+            util.showLoad();
+            servers.get({
+                url: API.writeOff.shop2WriteoffList,
+                data: { brand_id,  page, page_size, stime, etime },
+                failMsg: '加载失败！',
+            })
+            .then(res=>{
+                util.hideLoad();
+                this.totalNum = res.total || 0;
+                let _list = res.list || [];
+                if(page == 1)return this.writeOffList = _list;
+                if(!_list.length)return util.showNone('没有更多！');
+                this.page = page;
+                this.writeOffList = [...this.writeOffList, ..._list];
+                
+            })
         },
     }
 }

src/pages/write_off/search_result/search_result.vue

@@ -124,7 +124,7 @@ export default {
                 stadiumList,
                 curStadium,
             })
-            util.routeTo(`/pages/write_off/operate/operate`, 'nT');
+            util.routeTo(`/pages/write_off/operate/operate?type=site`, 'nT');
         },
         getList({ brand_id, stadium_id = '', date = '', page = 1, page_size = '' }){
             util.showLoad();