宋飞扬 1 anno fa
parent
commit
0170350f95
3 ha cambiato i file con 6 aggiunte e 8 eliminazioni
  1. 1 6
      src/main.js
  2. 0 1
      src/manifest.json
  3. 5 1
      src/pages/merchant/order/index.vue

+ 1 - 6
src/main.js

@@ -6,7 +6,6 @@ import cache from '@/mixin/cache';
 import empty from '@/components/empty';
 import tabbar from '@/components/tabbar';
 import { router, RouterMount } from '@/router'; //路径换成自己的
-App.mpType = 'app';
 
 Vue.use(router);
 Vue.use(uView);
@@ -18,11 +17,7 @@ Vue.config.productionTip = false;
 App.mpType = 'app';
 
 function isPromise(obj) {
-  return (
-    !!obj &&
-    (typeof obj === 'object' || typeof obj === 'function') &&
-    typeof obj.then === 'function'
-  );
+  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
 }
 
 uni.addInterceptor({

+ 0 - 1
src/manifest.json

@@ -56,7 +56,6 @@
   },
   "quickapp": {},
   "mp-weixin": {
-	// "usingComponents":false,
     "appid": "wx593877b3c990b15c",
     "setting": {
       "urlCheck": false,

+ 5 - 1
src/pages/merchant/order/index.vue

@@ -34,6 +34,7 @@
 import orderItem from '@/pages/merchant/order/components/orderItem.vue';
 import { getOrderListApi } from '@/api/merchant/order';
 export default {
+  components: { orderItem },
   data() {
     return {
       list1: [
@@ -51,13 +52,14 @@ export default {
       status: '0',
     };
   },
-  components: { orderItem },
+
   methods: {
     // 点击切换顶部导航栏
     handlerChangeItem(item) {
       this.typeStyle = item.index;
       this.getOrderList(item.id);
     },
+
     async getOrderList(status) {
       let result = Object.assign(
         {},
@@ -72,11 +74,13 @@ export default {
       }
     },
   },
+
   onShow() {
     this.getOrderList();
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .order {
   min-height: calc(100vh - 80rpx);