diff --git a/src/api/home.js b/src/api/home.js index 75839da..ae0f871 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -14,6 +14,10 @@ export default { getdefaultAddress: { method: 'GET', url: '/mall/web/defaultDistrict' + }, + getLocation:{ + method:"get", + url:"/mall/web/addressInfo" } } \ No newline at end of file diff --git a/src/assets/images/book.png b/src/assets/images/book.png deleted file mode 100644 index 7131c8a..0000000 Binary files a/src/assets/images/book.png and /dev/null differ diff --git a/src/assets/images/cover.jpg b/src/assets/images/cover.jpg deleted file mode 100644 index d980a1b..0000000 Binary files a/src/assets/images/cover.jpg and /dev/null differ diff --git a/src/assets/images/forest.png b/src/assets/images/forest.png deleted file mode 100644 index 0c49c0c..0000000 Binary files a/src/assets/images/forest.png and /dev/null differ diff --git a/src/assets/images/girl.jpg b/src/assets/images/girl.jpg deleted file mode 100644 index 9e9ddbd..0000000 Binary files a/src/assets/images/girl.jpg and /dev/null differ diff --git a/src/assets/images/hill.png b/src/assets/images/hill.png deleted file mode 100644 index eced40c..0000000 Binary files a/src/assets/images/hill.png and /dev/null differ diff --git a/src/assets/images/sunrise.png b/src/assets/images/sunrise.png deleted file mode 100644 index 2898717..0000000 Binary files a/src/assets/images/sunrise.png and /dev/null differ diff --git a/src/assets/images/sunshine.png b/src/assets/images/sunshine.png deleted file mode 100644 index 950582c..0000000 Binary files a/src/assets/images/sunshine.png and /dev/null differ diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index 2f8c4a8..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/assets/logotxt.png b/src/assets/logotxt.png deleted file mode 100644 index 6448b14..0000000 Binary files a/src/assets/logotxt.png and /dev/null differ diff --git a/src/main.js b/src/main.js index 1c70021..9d3f8c7 100644 --- a/src/main.js +++ b/src/main.js @@ -2,7 +2,13 @@ // (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from "vue"; -import { WechatPlugin, LoadingPlugin, ToastPlugin, AlertPlugin } from "vux"; +import { + WechatPlugin, + LoadingPlugin, + ToastPlugin, + AlertPlugin, + ConfirmPlugin +} from "vux"; import App from "./App"; import router from "./router"; import "@/assets/iconfont.css"; @@ -20,6 +26,7 @@ import "@/models/wxShare.js"; Vue.config.productionTip = false; Vue.use(WechatPlugin); +Vue.use(ConfirmPlugin) Vue.use(LoadingPlugin); Vue.use(ToastPlugin); Vue.use(AlertPlugin); diff --git a/src/models/coupon-model.js b/src/models/coupon-model.js index 13ebb28..5f081e6 100644 --- a/src/models/coupon-model.js +++ b/src/models/coupon-model.js @@ -1,35 +1,25 @@ -import utilsModel from './utils-model' -import couponApi from '../api/coupon' +import utilsModel from "./utils-model"; +import couponApi from "../api/coupon"; export default { - // 获取优惠券信息 - getCouponInfo : (batchNo, token) => + getCouponInfo: (batchNo, token) => utilsModel - .config(couponApi.getCouponInfo, {batchNo: batchNo}) - .request({ - params: { - sourceType: '1' - }, - headers: { - 'encodeToken': token - } - }), + .config(couponApi.getCouponInfo, { batchNo: batchNo }) + .request({ + params: { + sourceType: "1" + } + }), // 领取优惠券 - giveCoupon : (params, token) => - utilsModel - .config(couponApi.giveCoupon) - .request({ - params : params, - headers: { - 'encodeToken': token - } + giveCoupon: (params, token) => + utilsModel.config(couponApi.giveCoupon).request({ + params: params }), - //推荐用户 - sourceUser : (sourceUserId) => - utilsModel - .config(couponApi.sourceUser , {sourceUserId: sourceUserId}) - .request({ - }), -} \ No newline at end of file + //推荐用户 + sourceUser: sourceUserId => + utilsModel + .config(couponApi.sourceUser, { sourceUserId: sourceUserId }) + .request({}) +}; diff --git a/src/models/home-model.js b/src/models/home-model.js index 4fd1f2a..f7d0478 100644 --- a/src/models/home-model.js +++ b/src/models/home-model.js @@ -17,5 +17,12 @@ export default { headers: { version: "2.5.0" } + }), + getLocation: params => + utilsModel.config(homeApi.getLocation).request({ + params: params, + // headers: { + // "x-forwarded-for": "113.65.207.218" + // } }) }; diff --git a/src/models/utils-model.js b/src/models/utils-model.js index f3cd7ec..8ff992c 100644 --- a/src/models/utils-model.js +++ b/src/models/utils-model.js @@ -16,7 +16,7 @@ instance.interceptors.request.use( } // config.headers.encodeToken = // "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzEyMjQ3Mjc1OTcsInBheWxvYWQiOiJcIjE4MDYwMTE0MDkyODM4NDEwMXwxNTM5Njg4NzI3NTc5XCIifQ.sJBefUfJwybtWTNauW3j-w8VA6BlV56ASKmgQvDJc_Y"; - console.log(config); + // console.log(config); return config; }, err => { diff --git a/src/view/goods-classify.vue b/src/view/goods-classify.vue index 97a54a1..987585e 100644 --- a/src/view/goods-classify.vue +++ b/src/view/goods-classify.vue @@ -142,14 +142,13 @@ export default { }, //加载商品列表 getGoodsList() { - let that = this; - that.showLoading = true; + this.showLoading = true; var params = { merchantNo: this.no, districtId: this.id }; goodsApi.getGoods(params).then(res => { - that.showLoading = false; + this.showLoading = false; if (res.code == 0) { this.goodsList = res.data || []; let list = []; diff --git a/src/view/home.vue b/src/view/home.vue index b582c09..01d33e7 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -1,116 +1,121 @@