cps：订单

htmldev/cps/src/App.vue

@@ -29,6 +29,7 @@ export default {
   async created () {
     platform.isWeixin && WxConfig()
     this.$store.dispatch('common/getUserInfo')
+    this.$store.dispatch('common/getOrdertype')
   }
 }
 </script>

htmldev/cps/src/api/request.js

@@ -53,7 +53,7 @@ request.interceptors.request.use(request => {
 
   // 因为微信开发者工具重复授权，本地开发时写死
   if (/^(0|192|10|localhost)/.test(domain)) {
-    request.headers.wechatToken = '4a55eef015f9e7c8fe8a2e6477209819'
+    request.headers.wechatToken = '18ed91b12bde2a08dbaf0a779c994d1b'
   } else {
     request.headers.wechatToken = getCookieValue('fanbutingwechatToken')
   }

htmldev/cps/src/store/modules/common.js

@@ -8,12 +8,16 @@ const state = {
     user_balance: '', // 用户可提现余额(单位为分)
     user_unreceive_balance: '', // 用户未结算金额(单位为分
     created_at: '' // 注册时间
-  }
+  },
+  orderType: [] // 订单类型
 }
 
 const getters = {
   userinfo (state) {
     return state.userinfo
+  },
+  orderType (state) {
+    return state.orderType
   }
 }
 
@@ -30,6 +34,19 @@ const actions = {
     } catch (err) {
       console.log(err)
     }
+  },
+  async getOrdertype ({ commit }) {
+    try {
+      const { status, data } = await request({
+        method: 'GET',
+        url: '/api/order/type/list'
+      })
+      if (status) {
+        commit('UPDATE_ORDER_TYPE', data)
+      }
+    } catch (err) {
+      console.log(err)
+    }
   }
 }
 
@@ -38,6 +55,9 @@ const mutations = {
     state.userinfo = {
       ...value
     }
+  },
+  UPDATE_ORDER_TYPE (state, value) {
+    state.orderType = [...value]
   }
 }
 

htmldev/cps/src/utils/wxConfig.js

@@ -6,7 +6,7 @@ const wxJs = () => request({
   url: '/api/wechat/account/config',
   params: {
     url: location.href,
-    wechat_app_code: '' //  写死
+    wechat_app_code: 'fanbuting' //  写死
   }
 })
 

htmldev/cps/src/views/marketing/make/index.vue

@@ -30,7 +30,7 @@
                   :src="item.user_head_img_url"
                   alt="">
               </p>
-              <p class="user">todo</p>
+              <p class="user">{{ item.user_nickname }}</p>
               <p class="shop">{{ item.order_title }}</p>
             </div>
             <p class="money">+{{ item.order_commission | fen2Yuan }}</p>

htmldev/cps/src/views/order/child/main.vue

@@ -53,6 +53,16 @@ export default {
   components: {
     'van-loading': Loading
   },
+  props: {
+    orderPlatformSonType: {
+      type: Number,
+      default: 0
+    },
+    orderStatus: {
+      type: Number,
+      default: 0
+    }
+  },
   data () {
     return {
       finished: false, // 所有数据是否加载完
@@ -98,7 +108,12 @@ export default {
       this.isFetchLock = true
       this.pagenum++
       try {
-        const { status, data, msg } = await apiOrderList({ page: this.pagenum, page_size: this.pagesize })
+        const { status, data, msg } = await apiOrderList({
+          page: this.pagenum,
+          page_size: this.pagesize,
+          order_platform_son_type: this.orderPlatformSonType,
+          order_status: this.orderStatus
+        })
         if (status) {
           const { list } = data
           // 下拉刷新数据清空

htmldev/cps/src/views/order/index.vue

@@ -4,15 +4,17 @@
     <van-dropdown-menu
       :active-color="'#4D69A4'">
       <van-dropdown-item
-        :title="'全部'"
-        v-model="value1"
-        :options="option1"/>
+        :title="'类型'"
+        v-model="orderPlatformSonType"
+        :options="ordertype"/>
       <van-dropdown-item
-        :title="'收入'"
-        v-model="value2"
-        :options="option2"/>
+        :title="'状态'"
+        v-model="orderStatus"
+        :options="arrOrderStatus"/>
     </van-dropdown-menu>
-    <Main/>
+    <Main
+      :orderPlatformSonType="orderPlatformSonType"
+      :orderStatus="orderStatus"/>
     <van-popup
       class="fbt-van-popup"
       v-model="showDetail"
@@ -62,21 +64,27 @@ export default {
   },
   data () {
     return {
-      value1: 0,
-      value2: 0,
-      option1: [
-        { text: '全部商品', value: 0 },
-        { text: '新款商品', value: 1 },
-        { text: '活动商品', value: 2 }
-      ],
-      option2: [
-        { text: '默认排序', value: 0 },
-        { text: '好评排序', value: 1 },
-        { text: '销量排序', value: 2 }
+      orderPlatformSonType: 0,
+      orderStatus: 0,
+      arrOrderStatus: [
+        { text: '全部', value: 0 },
+        { text: '未结算', value: 1 },
+        { text: '已结算', value: 2 }
       ],
       showDetail: false
     }
   },
+  computed: {
+    ordertype () {
+      const result = this.$store.getters['common/orderType'].map(item => ({
+        ...item,
+        text: item.type_name,
+        value: item.order_platform_son_type
+      }))
+
+      return [{ text: '全部', value: 0 }, ...result]
+    }
+  },
   async mounted () {
     await this.$nextTick()
   }