diff --git a/package.json b/package.json
index d766058..5f2c6c3 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,12 @@
},
"dependencies": {
"axios": "^0.16.2",
- "babel-polyfill": "^6.26.0",
"echarts": "^3.7.1",
"element-ui": "^2.4.6",
"lodash": "^4.17.4",
"vue": "^2.5.9",
"vue-awesome-swiper": "^3.1.3",
+ "vue-cookies": "^1.5.13",
"vue-router": "^2.8.1",
"vue-template-compiler": "^2.5.9",
"vue-weui": "^0.3.2",
@@ -26,8 +26,9 @@
"devDependencies": {
"autoprefixer": "^6.7.2",
"babel-core": "^6.26.0",
- "babel-loader": "^6.2.10",
+ "babel-loader": "^6.4.1",
"babel-plugin-transform-runtime": "^6.22.0",
+ "babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"babel-preset-stage-2": "^6.24.1",
"babel-register": "^6.26.0",
@@ -47,7 +48,7 @@
"jquery": "^3.3.1",
"less": "^2.7.1",
"less-loader": "^2.2.3",
- "node-sass": "^4.9.0",
+ "node-sass": "^4.12.0",
"opn": "^4.0.2",
"optimize-css-assets-webpack-plugin": "^1.3.2",
"ora": "^1.3.0",
diff --git a/src/api/home.js b/src/api/home.js
index ae0f871..3eb1b9b 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -18,6 +18,13 @@ export default {
getLocation:{
method:"get",
url:"/mall/web/addressInfo"
+ },
+ countExtend:{
+ method:"POST",
+ url:"/mall/web/center/insert/data"
+ },
+ updateUniqueId:{
+ method:"get",
+ url:"/mall/web/center/update/uniqueId"
}
-
}
\ No newline at end of file
diff --git a/src/common/util.js b/src/common/util.js
index 6d6edf7..47b904a 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -60,3 +60,4 @@ export default {
}
}
+
diff --git a/src/components/nav-bottom.vue b/src/components/nav-bottom.vue
index 1d8faf1..0bf467a 100644
--- a/src/components/nav-bottom.vue
+++ b/src/components/nav-bottom.vue
@@ -5,11 +5,11 @@
首页
-
+
服务
-
+
我的
diff --git a/src/main.js b/src/main.js
index 9d3f8c7..a727bfb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,6 +23,7 @@ import "@/assets/styles/swiper.css";
//import wx from 'weixin-js-sdk'
//import axios from 'axios'
import "@/models/wxShare.js";
+import VueCookies from 'vue-cookies'
Vue.config.productionTip = false;
Vue.use(WechatPlugin);
@@ -30,6 +31,7 @@ Vue.use(ConfirmPlugin)
Vue.use(LoadingPlugin);
Vue.use(ToastPlugin);
Vue.use(AlertPlugin);
+Vue.use(VueCookies)
Vue.use(VueAwesomeSwiper);
Vue.mixin({
@@ -46,7 +48,8 @@ Vue.mixin({
setToken() {
var strCookie = document.cookie;
var cookieName = "1hjz_mall_login_access_token=";
- var token = strCookie.slice(cookieName.length);
+ // var token = strCookie.slice(cookieName.length);
+ var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9'
sessionStorage.setItem("token", token);
},
getParam(name) {
diff --git a/src/models/home-model.js b/src/models/home-model.js
index f7d0478..178af7c 100644
--- a/src/models/home-model.js
+++ b/src/models/home-model.js
@@ -24,5 +24,13 @@ export default {
// headers: {
// "x-forwarded-for": "113.65.207.218"
// }
+ }),
+ countExtend: params =>
+ utilsModel.config(homeApi.countExtend).request({
+ params: params
+ }),
+ updateUniqueId: params =>
+ utilsModel.config(homeApi.updateUniqueId).request({
+ params: params
})
};
diff --git a/src/models/wxShare.js b/src/models/wxShare.js
index 63fd0b0..9f6403a 100644
--- a/src/models/wxShare.js
+++ b/src/models/wxShare.js
@@ -11,9 +11,9 @@ Vue.prototype.wxShare = function(params) {
if (response.code != 0) {
return;
}
- var jsApiSignConfig = response.data.jsApiSignConfig;
- var shareConfig = response.data.shareConfig;
-
+
+ var jsApiSignConfig = response.response.jsApiSignConfig;
+ var shareConfig = response.response.shareConfig;
wx.config({
debug: false, // 开启调试模式,开发时可以开启
appId: jsApiSignConfig.appId, // 必填，公众号的唯一标识 由接口返回
diff --git a/src/router/index.js b/src/router/index.js
index 843f57d..4a0875b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -63,7 +63,7 @@ let router = new Router({
},
{
path: "/",
- redirect: "/home"
+ redirect: "/home/:uniqueId"
},
{
path: "/order-check",
diff --git a/src/view/home.vue b/src/view/home.vue
index 6abd4a4..d909a97 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -65,9 +65,9 @@
-
-
+
- 立即购买
+ 立即购买
@@ -118,6 +118,8 @@ import configs from "../configs";
import { Alert, Toast, Loading } from "vux";
import routerFooter from "../components/nav-bottom";
import popupPicker from "../components/popup-picker.vue";
+import Qs from 'qs';
+
var locationUrl = configs.locationUrl;
export default {
@@ -131,6 +133,7 @@ export default {
data() {
return {
show: false,
+ uniqueId:Qs.parse(location.search.substring(1)).uniqueId,
defaultCity: "天河区", //区名 默认值 不需要去掉
merchantNo: 2, //商户编号 默认值 不需要去掉
districtId: "440106000", //区id 默认值 不需要去掉
@@ -245,10 +248,39 @@ export default {
var merchantNo = this.merchantNo;
this.wxShare({
merchantNo: merchantNo,
+ uniqueId:this.uniqueId,
source: 0,
url: encodeURIComponent(location.href)
});
},
+ countExtend() {
+ return new Promise((resolve, reject) => {
+ var params = {
+ buryingPointType: 0,
+ salesmanUniqueIdentity: this.uniqueId,
+ timeStr: this.getTime(Date.now())
+ };
+ homeApi.countExtend(params).then(res => {
+
+ resolve();
+ });
+ });
+ },
+ getTime(time) {
+ let date = new Date(time);
+ let year = date.getFullYear();
+ let month = this.checkTime(date.getMonth() + 1);
+ let day = this.checkTime(date.getDate());
+ let str =
+ year + "-" + month + "-" + day;
+ return str;
+ },
+ checkTime(i) {
+ if (i < 10) {
+ i = "0" + i;
+ }
+ return i;
+ },
// 商品分类
goods(c_no) {
this.$router.push({
@@ -269,10 +301,10 @@ export default {
cityId: this.cityId ? this.cityId : ""
})
.then(res => {
- if (res.data.allAddress && res.data.userAddress) {
- this.addressData = res.data.allAddress;
+ if (res.response.allAddress && res.response.userAddress) {
+ this.addressData = res.response.allAddress;
this.flag = true;
- let data = res.data;
+ let data = res.response;
if (data.userAddress.type == 1) {
this.address =
data.userAddress.cityName +
@@ -380,7 +412,28 @@ export default {
// this.getAddress();
// this.getLocation();
this.getData();
- this.ShareWenXin();
+ let uuniqueId = Qs.parse(location.search.substring(1)).uniqueId
+
+ if(uuniqueId !== undefined && uuniqueId !== null && uuniqueId !== ""){
+ this.countExtend();
+ uuniqueId = '';
+ }
+ return new Promise((resolve, reject) => {
+ var params = {
+ salesmanUniqueIdentity: uuniqueId,
+ };
+ homeApi.updateUniqueId(params).then(res => {
+ this.showLoading = false;
+ if (res.code == 0) {
+ this.uniqueId=this.$cookies.get('1hjz_mall_unique_id')
+ this.ShareWenXin();
+ } else {
+ this.$vux.toast.text(res.msg, "middle");
+ }
+ resolve();
+ });
+ });
+
}
};
diff --git a/src/view/order-check.vue b/src/view/order-check.vue
index 17e9b99..c73fe38 100644
--- a/src/view/order-check.vue
+++ b/src/view/order-check.vue
@@ -249,6 +249,7 @@ export default {
goodsNo: goodsNo,
couponNo: couponNo,
goodsVersion: goodsVersion,
+ salesmanUniqueIdentity:this.$cookies.get('1hjz_mall_unique_id'),
remark: this.info.text
})
)
diff --git a/src/view/order-detail.vue b/src/view/order-detail.vue
index 342d7a9..6f0221a 100644
--- a/src/view/order-detail.vue
+++ b/src/view/order-detail.vue
@@ -310,9 +310,9 @@ export default {
let promise = new Promise((resolve, reject) => {
orderApi
.addOrder({
- goodsNo: goodsNo,
goodsNo: goodsNo,
couponNo: couponNo,
+ salesmanUniqueIdentity: this.$cookies.get('1hjz_mall_unique_id'),
goodsVersion: this.info.goodsVersion
})
.then(res => {