diff --git a/wx-mini-program/config/api.js b/wx-mini-program/config/api.js
index ff9f2b8..879d921 100644
--- a/wx-mini-program/config/api.js
+++ b/wx-mini-program/config/api.js
@@ -25,6 +25,8 @@ module.exports = {
GoodsDetail: WxApiRoot + 'goods/detail', //获得商品的详情
GoodsRelated: WxApiRoot + 'goods/related', //商品详情页的关联商品（大家都在看）
+ CreateShareImg: WxApiRoot + 'agency/createShareImg', //创建分享海报
+
BrandList: WxApiRoot + 'brand/list', //品牌列表
BrandDetail: WxApiRoot + 'brand/detail', //品牌详情
@@ -99,6 +101,7 @@ module.exports = {
UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息
BrokerageMain: WxApiRoot + 'brokerage/main',//佣金收益主页面
SettleOrderList: WxApiRoot + 'brokerage/settleOrderList',//佣金收益主页面
+ ApplyWithdrawal: WxApiRoot + 'brokerage/applyWithdrawal',//佣金提现申请
ExtractList: WxApiRoot + 'brokerage/extractList',//佣金账号提现记录
ArticleDetail: WxApiRoot + 'article/detail',//公告详情
ApplyAgency: WxApiRoot + 'user/applyAgency',//代理申请
diff --git a/wx-mini-program/lib/coupon-window/index.wxml b/wx-mini-program/lib/coupon-window/index.wxml
index 7657d4e..4a36989 100644
--- a/wx-mini-program/lib/coupon-window/index.wxml
+++ b/wx-mini-program/lib/coupon-window/index.wxml
@@ -1,6 +1,6 @@
-
+
￥{{item.discount}}
【{{item.desc}}】购物买{{item.min}}减{{item.discount}}
diff --git a/wx-mini-program/pages/about/about.js b/wx-mini-program/pages/about/about.js
index ff97cb6..3c378a3 100644
--- a/wx-mini-program/pages/about/about.js
+++ b/wx-mini-program/pages/about/about.js
@@ -13,7 +13,7 @@ Page({
load_statue: true,
shopInfo: {
name: '聚惠星',
- address: 'https://gitee.com/qiguliuxing/dts-shop',
+ address: 'https://www.shequlianshang.com/dts/index.html',
latitude: 27.4871724214,
longitude: 110.8950504844,
linkPhone: '19908488612',
diff --git a/wx-mini-program/pages/brokerage/record/record.wxml b/wx-mini-program/pages/brokerage/record/record.wxml
index b42cf33..4829679 100644
--- a/wx-mini-program/pages/brokerage/record/record.wxml
+++ b/wx-mini-program/pages/brokerage/record/record.wxml
@@ -3,17 +3,17 @@
{{item.amount}}
- 提现中
- 已提现
- 月结
+ 审批通过
+ 审批拒绝
+ 申请中
- {{item.mobile}}
- 系统
- 时间：{{item.traceTime}}
+ 个人申请
+ 系统月结
+ 时间：{{item.addTime}}
- 余额：{{item.remainAmount}}
+ 总额：{{item.totalAmount}}
diff --git a/wx-mini-program/pages/brokerage/record/record.wxss b/wx-mini-program/pages/brokerage/record/record.wxss
index 79470e2..134169a 100644
--- a/wx-mini-program/pages/brokerage/record/record.wxss
+++ b/wx-mini-program/pages/brokerage/record/record.wxss
@@ -24,7 +24,7 @@ page {
}
.address-list .l {
- width: 155rpx;
+ width: 135rpx;
height: 80rpx;
overflow: hidden;
}
diff --git a/wx-mini-program/pages/brokerage/withdrawal/withdrawal.js b/wx-mini-program/pages/brokerage/withdrawal/withdrawal.js
index 9836cae..133b967 100644
--- a/wx-mini-program/pages/brokerage/withdrawal/withdrawal.js
+++ b/wx-mini-program/pages/brokerage/withdrawal/withdrawal.js
@@ -1,5 +1,7 @@
var api = require('../../../config/api.js');
+var util = require('../../../utils/util.js');
var check = require('../../../utils/check.js');
+var user = require('../../../utils/user.js');
var app = getApp();
Page({
@@ -82,7 +84,7 @@ Page({
},
goWithdrawal: function() {
var that = this;
- if (this.data.mobile.length == 0 || this.data.code.length == 0) {
+ if (this.data.mobile.length == 0) {
wx.showModal({
title: '错误信息',
content: '手机号和验证码不能为空',
@@ -100,7 +102,20 @@ Page({
return false;
}
//调用后台申请提现接口
-
+ util.request(api.ApplyWithdrawal, {
+ mobile: that.data.mobile,
+ amt: that.data.amt
+ }, 'POST').then(function (res) {
+ if (res.errno === 0) {
+ wx.showToast({
+ title: '提现申请成功,等待审批结算'
+ });
+ util.redirect('/pages/brokerage/record/record');
+ } else {
+ util.showErrorToast(res.errmsg);
+ }
+ });
+
},
bindMobileInput: function(e) {
this.setData({
diff --git a/wx-mini-program/pages/brokerage/withdrawal/withdrawal.wxml b/wx-mini-program/pages/brokerage/withdrawal/withdrawal.wxml
index 9d138db..6cef06f 100644
--- a/wx-mini-program/pages/brokerage/withdrawal/withdrawal.wxml
+++ b/wx-mini-program/pages/brokerage/withdrawal/withdrawal.wxml
@@ -8,6 +8,7 @@
请去设置页面绑定手机
+
+
diff --git a/wx-mini-program/pages/goods/goods.js b/wx-mini-program/pages/goods/goods.js
index 2ee5043..42b24fc 100644
--- a/wx-mini-program/pages/goods/goods.js
+++ b/wx-mini-program/pages/goods/goods.js
@@ -51,7 +51,18 @@ Page({
},
shareFriendOrCircle: function() {
- //var that = this;
+ let that = this;
+ util.request(api.CreateShareImg, {
+ shareObjId: that.data.id,
+ type:1 //商品类型的海报图
+ }, 'POST').then(function(res) {
+ if (res.errno === 0) {
+ that.setData({
+ shareImage: res.data.shareUrl
+ });
+ }
+ });
+
if (this.data.openShare === false) {
this.setData({
openShare: !this.data.openShare
@@ -170,7 +181,7 @@ Page({
specificationList: res.data.specificationList,
productList: res.data.productList,
userHasCollect: res.data.userHasCollect,
- shareImage: res.data.shareImage,
+ shareImage: res.data.shareImage == null?"":res.data.shareImage,
checkedSpecPrice: res.data.info.retailPrice,
groupon: res.data.groupon
});
diff --git a/wx-mini-program/pages/goods/goods.wxml b/wx-mini-program/pages/goods/goods.wxml
index 3cf4b95..816fe80 100644
--- a/wx-mini-program/pages/goods/goods.wxml
+++ b/wx-mini-program/pages/goods/goods.wxml
@@ -21,11 +21,11 @@
diff --git a/wx-mini-program/pages/index/index.js b/wx-mini-program/pages/index/index.js
index 42055e5..e28b545 100644
--- a/wx-mini-program/pages/index/index.js
+++ b/wx-mini-program/pages/index/index.js
@@ -88,6 +88,17 @@ Page({
let _type = info_arr[0];
let id = info_arr[1];
+ let shareUserId = null;//默认用户
+ if (info_arr.length == 4 && info_arr[2] == 'user'){
+ shareUserId = info_arr[3];
+ } else if (_type == 'user'){
+ shareUserId = id;
+ }
+
+ if (shareUserId != null){
+ wx.setStorageSync('shareUserId', id);
+ }
+
if (_type == 'goods') {
wx.navigateTo({
url: '../goods/goods?id=' + id
@@ -105,9 +116,6 @@ Page({
url: '../topicDetail/topicDetail?id=' + id
});
} else {
- if (id != null){
- wx.setStorageSync('shareUserId', id);
- }
wx.navigateTo({
url: '../index/index'
});
diff --git a/wx-mini-program/pages/ucenter/index/index.wxml b/wx-mini-program/pages/ucenter/index/index.wxml
index e914aa7..80f9341 100644
--- a/wx-mini-program/pages/ucenter/index/index.wxml
+++ b/wx-mini-program/pages/ucenter/index/index.wxml
@@ -14,7 +14,7 @@
- 当前佣金
+ 可提佣金
{{remainAmount || 0.00}}
diff --git a/wx-mini-program/pages/ucenter/user/user.js b/wx-mini-program/pages/ucenter/user/user.js
index 9fb2213..c6f6e3c 100644
--- a/wx-mini-program/pages/ucenter/user/user.js
+++ b/wx-mini-program/pages/ucenter/user/user.js
@@ -51,6 +51,15 @@ Page({
return;
}
+ if (!this.data.userInfo.phone || this.data.userInfo.phone.length == 0) {
+ wx.showToast({
+ title: '绑定失败：请先绑定手机号',
+ icon: 'none',
+ duration: 3000
+ });
+ return;
+ }
+
util.request(api.ApplyAgency, { desc: "代理申请" }, 'POST').then(function (res) {
if (res.errno === 0) {
let userInfo = wx.getStorageSync('userInfo');
@@ -104,6 +113,39 @@ Page({
}
});
},
+ // 保存推广码到相册
+ saveShare: function () {
+ let that = this;
+ wx.downloadFile({
+ url: that.data.userSharedUrl,
+ success: function (res) {
+ console.log(res)
+ wx.saveImageToPhotosAlbum({
+ filePath: res.tempFilePath,
+ success: function (res) {
+ wx.showModal({
+ title: '推广码下载',
+ content: '推广二维码成功保存到相册!!',
+ showCancel: false,
+ confirmText: '好的',
+ confirmColor: '#a78845',
+ success: function (res) {
+ if (res.confirm) {
+ console.log('用户点击确定');
+ }
+ }
+ })
+ },
+ fail: function (res) {
+ console.log('fail')
+ }
+ })
+ },
+ fail: function () {
+ console.log('fail')
+ }
+ })
+ },
exitLogin: function () {
wx.showModal({
title: '',
diff --git a/wx-mini-program/pages/ucenter/user/user.wxml b/wx-mini-program/pages/ucenter/user/user.wxml
index f0e814f..523ac97 100644
--- a/wx-mini-program/pages/ucenter/user/user.wxml
+++ b/wx-mini-program/pages/ucenter/user/user.wxml
@@ -44,7 +44,8 @@
-
+ 代理专属推广二维码（长按保存到相册）
+
diff --git a/wx-mini-program/project.config.json b/wx-mini-program/project.config.json
index e74b646..d3b359c 100644
--- a/wx-mini-program/project.config.json
+++ b/wx-mini-program/project.config.json
@@ -3,6 +3,7 @@
"setting": {
"urlCheck": true,
"es6": true,
+ "enhance": false,
"postcss": true,
"minified": true,
"newFeature": true,
@@ -18,7 +19,7 @@
}
},
"compileType": "miniprogram",
- "libVersion": "2.0.4",
+ "libVersion": "2.9.4",
"appid": "wx4901b319ace4f88a",
"projectname": "dts-shop",
"simulatorType": "wechat",
diff --git a/wx-mini-program/static/images/friend.png b/wx-mini-program/static/images/friend.png
index b8a372b..13ad7fb 100644
Binary files a/wx-mini-program/static/images/friend.png and b/wx-mini-program/static/images/friend.png differ
diff --git a/wx-mini-program/static/images/friend_1.png b/wx-mini-program/static/images/friend_1.png
new file mode 100644
index 0000000..b8a372b
Binary files /dev/null and b/wx-mini-program/static/images/friend_1.png differ