shish 4 years ago
parent
commit
d2aa45ccef

+ 0 - 5
hdApp/src/admin/home/me.vue

@@ -143,16 +143,11 @@ export default {
       this.$refs.dorpdownSelect.dropdownShow = true;
     },
     getMyInfo () {
-      console.log('uuuuuuu')
       mainMy().then(res=>{
-        console.log(res)
-        console.log('------')
         if(res.code == 1){
           this.shopInfo = res.data
         }
       })
-      console.log('hhhhhhhhh')
-      console.log('3333')
       uni.stopPullDownRefresh()
     },
     async changeShop() {

+ 8 - 13
hdApp/src/admin/home/order.vue

@@ -109,17 +109,17 @@ export default {
   },
   onPullDownRefresh () {
     this.resetList();
-    this._list().then(res => {
-      uni.stopPullDownRefresh();
+    this.getOrderList().then(res => {
+      uni.stopPullDownRefresh()
     });
   },
   onReachBottom () {
     if (!this.list.finished) {
-      this._list().then(res => {
-        uni.stopPullDownRefresh();
+      this.getOrderList().then(res => {
+        uni.stopPullDownRefresh()
       });
     } else {
-      uni.stopPullDownRefresh();
+      uni.stopPullDownRefresh()
     }
   },
   computed: {
@@ -140,20 +140,15 @@ export default {
   },
   methods: {
     init () {
-
-        this._list();
-      
+      this.getOrderList();
     },
-    _list () {
+    getOrderList () {
       let status = JSON.parse(JSON.stringify(this.tabIndex));
       return getListB({
         status: status,
         search: "",
         page: this.list.page
       }).then(res => {
-        console.log('1111')
-        console.log(res)
-        console.log('2222')
         this.completes(res);
         if (this.$util.isEmpty(res.data)){
           return false
@@ -171,7 +166,7 @@ export default {
       } else {
         this.tabIndex = e.index;
         this.resetList();
-        this._list();
+        this.getOrderList();
       }
     },
     // 免发货

+ 1 - 1
hdApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "http://api.shop.huaml.com",
+    "apiHost": "https://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
     "imgHost": "https://img.huaml.com",
     "name":"花美玲"

+ 0 - 10
hdApp/src/mixins/list.js

@@ -1,15 +1,5 @@
 export default {
   watch: {
-    'list.loading'(val) {
-      if (val) {
-        uni.showLoading({
-          title: '加载中...',
-          mask: true,
-        })
-      } else {
-        uni.hideLoading()
-      }
-    },
   },
   data() {
     return {

+ 1 - 4
hdApp/src/plugins/luch-request_0.0.7/request.js

@@ -122,12 +122,10 @@ class Request {
 		options.data = qs.stringify(options.data) || {}
 		options.header = options.header || this.config.header
 		options.method = options.method || this.config.method
-		console.log(options)
 		return new Promise((resolve, reject) => {
 			let next = true
 			let _config = null
 			options.complete = (response) => {
-				console.log(response)
 				const statusCode = response.statusCode
 				response.config = _config
 				response.config.config = config
@@ -209,5 +207,4 @@ class Request {
 		return this.request(options, config)
 	}
 }
-export default new Request()
-
+export default new Request()