From 8660e95d02615a3c6879fa51f8adeaf68e9fd959 Mon Sep 17 00:00:00 2001 From: cmxdd <86407334@qq.com> Date: Wed, 29 Jul 2020 10:40:55 +0800 Subject: [PATCH 1/3] test --- App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App.vue b/App.vue index 1b2489c..c0406a7 100644 --- a/App.vue +++ b/App.vue @@ -1,7 +1,7 @@ +/*每个页面公共css */ +@import 'uview-ui/index.scss'; + diff --git a/common/http.api.js b/common/http.api.js index aa1fa72..b7fac75 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -8,7 +8,7 @@ const install = (Vue, vm) => { return vm.$u.get("Streaming/getLiveSpec") }, login({member_name,member_password}){ - return vm.$u.post("Login/login",{member_name,member_password}) + return vm.$u.get("/Login/expertLogin",{member_name,member_password}) }, createLivesp({spec_name}){ return vm.$u.post("Streaming/createLivesp",{spec_name}) @@ -21,7 +21,19 @@ const install = (Vue, vm) => { }, liveStreamList(){ return vm.$u.post("Streaming/liveStreamList") - } + }, + // 获取订单列表 + getorderlist(){ + return vm.$u.get("/Order/orderList") + }, + // 获取轮播图列表 + getswiper(){ + return vm.$u.get("/Order/orderList") + }, + // 商家登陆 + shoplogin(obj){ + return vm.$u.get("/Login/storeLogin",obj) + }, } // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 vm.$u.api = api; diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 4025b10..498c36f 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -1,7 +1,7 @@ const install = (Vue, vm) => { // 此为自定义配置参数，具体参数见上方说明 Vue.prototype.$u.http.setConfig({ - baseUrl: 'https://dmmall.sdbairui.com//storeapi', + baseUrl: 'https://dmmall.sdbairui.com/storeapi', loadingText: '努力加载中~', loadingTime: 800, // 设置自定义头部content-type diff --git a/package-lock.json b/package-lock.json index 5f7bbf4..46ce289 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,13 +6,8 @@ "dependencies": { "uview-ui": { "version": "1.5.2", -<<<<<<< HEAD "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz", "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w==" -======= - "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz", - "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk=" ->>>>>>> fa383397b331ec0091096becf886f978cc1277fc } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 08b2f6d..fc85544 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,31 +1,35 @@