wxd / MShopWeApp

Commit 48106e65c17d419f2b59704cbacbb0301058bb29

Authored by taiyuan
2 parents 0096f66c 3cf7ae6b

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 10 changed files with 87 additions and 544 deletions
components/diy_store_select/diy_store_select.js
  View file @48106e6
... ... @@ -44,10 +44,6 @@ Component({
44 44  
45 45 //获取顶部的门店
46 46 getApp().get_user_store(function(){
47   - var top_store=getApp().globalData.pk_store;
48   - if(top_store){
49   - th.setData({top_store:top_store});
50   - }else{
51 47 wx.getLocation({
52 48 type: 'gcj02',
53 49 success: function(res) {
... ... @@ -61,9 +57,12 @@ Component({
61 57 }
62 58 }
63 59 })
64   - }
  60 +
65 61 })
66 62 },
  63 +
  64 +
  65 +
67 66 //-- 设置最近的店为默认的店,一开始加载的时候 --
68 67 set_fir_store_to_def(){
69 68 var th=this;
... ... @@ -74,7 +73,13 @@ Component({
74 73 page:1,
75 74 };
76 75 dd.lat = th.data.lat;
77   - dd.lon = th.data.lon;
  76 + dd.lon = th.data.lon;
  77 +
  78 + var top_store=getApp().globalData.pk_store;
  79 + if(top_store){
  80 + dd.pickup_id=top_store.pickup_id;
  81 + }
  82 +
78 83 //----------获取门店,最近的门店----------------
79 84 getApp().request.promiseGet("/api/weshop/pickup/list", {
80 85 data: dd,
... ... @@ -173,8 +178,7 @@ Component({
173 178 this.deal_pickup(this.data.all_pick_list,func)
174 179 return false;
175 180 }
176   - var th = this,that=this;
177   - var i = getApp().request;
  181 + var th = this,that=this;
178 182 var dd = {
179 183 store_id: o.stoid,
180 184 isstop: 0,
... ...
components/diy_store_select/diy_store_select.wxml
  View file @48106e6
  1 +<wxs module="filters" src="../../utils/filter.wxs"></wxs>
  2 +
1 3 <!-- 如果是自定义模板的时候 -->
2 4 <block wx:if="{{object}}">
3 5 <view class="store_sele1 flex ai_c" bindtap="sele_top_store" style="background-color:{{object.bgcolor}};color: {{object.word_color}};">
... ... @@ -51,7 +53,7 @@
51 53 </view>
52 54 <view>
53 55 <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
54   - 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
  56 + 距离： {{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
55 57 </view>
56 58 </view>
57 59 <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
... ...
packageB/pages/user/binding_info/binding_info.js 0 → 100644
  View file @48106e6
  1 +// packageB/pages/user/binding_info/binding_info.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
0 67 \ No newline at end of file
... ...
packageB/pages/user/binding_info/binding_info.json 0 → 100644
  View file @48106e6
  1 +{
  2 + "usingComponents": {}
  3 +}
0 4 \ No newline at end of file
... ...
packageB/pages/user/binding_info/binding_info.wxml 0 → 100644
  View file @48106e6
  1 +<!--packageB/pages/user/binding_info/binding_info.wxml-->
  2 +<text>packageB/pages/user/binding_info/binding_info.wxml</text>
... ...
packageB/pages/user/binding_info/binding_info.wxss 0 → 100644
  View file @48106e6
  1 +/* packageB/pages/user/binding_info/binding_info.wxss */
0 2 \ No newline at end of file
... ...
pages/user/binding_info/binding_info.js deleted
View file @0096f66
1   -var e = getApp(),app=e, a = e.request, t = e.globalData.setting,os=t, i = require("../../../utils/common.js");
2   -
3   -Page({
4   - data: {
5   - url: t.url,
6   - iurl: t.imghost,
7   - nickName: "",
8   - userHeadPic: "",
9   - isRegist: !1,
10   - bindMobile: "",
11   - bindCode: "",
12   - regMobile: "",
13   - regCode: "",
14   - regPwd: "",
15   - isAgree: !1,
16   - canGetCode: !1,
17   -
18   - config:null,
19   -
20   - store: null,
21   - imghots: os.imghost,
22   - gettime:0,
23   - },
24   - onLoad: function(e) {
25   - var th=this;
26   - app.getConfig(function (e) {
27   - th.setData({ store: e });
28   - })
29   - app.getConfig2(function (e) {
30   - var cf = JSON.parse(e.sms_send_type);
31   - th.setData({ config: cf });
32   - console.log(th.data.config);
33   - })
34   -
35   -
36   - },
37   - account: function() {
38   - this.setData({
39   - isRegist: !1
40   - });
41   - },
42   - regist: function() {
43   - this.setData({
44   - isRegist: !0
45   - });
46   - },
47   - setMobile: function(e) {
48   - this.data.bindMobile = e.detail.value;
49   - },
50   - setCode: function(e) {
51   - this.data.bindCode = e.detail.value;
52   - },
53   -
54   - //---获取短信验证码---
55   - getCode: function(t) {
56   - var th=this;
57   - if ("" != this.data.bindMobile) {
58   - var s = this;
59   - a.post("/api/weshop/smslog/sendsms", {
60   - data: {
61   - mobile: this.data.bindMobile,
62   - store_id: os.stoid,
63   - wxopenid: app.globalData.openid,
64   - },
65   - success: function(e) {
66   - if(e.data.code==0){
67   - th.setData({ gettime: th.data.config.time_out, canGetCode:1});
68   - th.setInt();
69   - }else{
70   - e.showWarning(e.data.msg);
71   - }
72   - }
73   - });
74   - } else e.showWarning("请输入手机号码");
75   - },
76   -
77   - //----发送验证码的推送时间倒计时---
78   - setInt:function(){
79   - var th=this;
80   - var it=setInterval(function(){
81   - var ti = th.data.gettime-1;
82   - if (ti<=0){
83   - th.setData({ gettime:0, canGetCode: !1 });
84   - clearInterval(it);
85   - }
86   - else{
87   - th.setData({ gettime: ti,});
88   - }
89   - },1000);
90   - },
91   -
92   - setRegMobile: function(e) {
93   - this.data.regMobile = e.detail.value;
94   - },
95   - setRegPwd: function(e) {
96   - this.data.regPwd = e.detail.value;
97   - },
98   - setRegCode: function(e) {
99   - this.data.regCode = e.detail.value;
100   - },
101   - getRegCode: function(t) {
102   - if ("" != this.data.regMobile) {
103   - var s = this;
104   - a.post("/Home/Api/checkRegMobile", {
105   - data: {
106   - mobile: this.data.regMobile
107   - },
108   - success: function(e) {
109   - i.sendBindSmsCode(s.data.regMobile);
110   - }
111   - });
112   - } else e.showWarning("请输入手机号码");
113   - },
114   - check: function() {
115   - this.setData({
116   - isAgree: !this.data.isAgree
117   - });
118   - },
119   - bindAccount: function() {
120   - var t = this;
121   - var r = getApp().globalData.getu;
122   - var openid = getApp().globalData.openid;
123   -
124   - "" != this.data.bindMobile ? "" != this.data.bindCode ? a.get("/api/weshop/users/thirdLogin", {
125   - data: {
126   - mobile: t.data.bindMobile,
127   - code: t.data.bindCode,
128   - openid: openid,
129   - nickname: r.nickName,
130   - head_pic: r.avatarUrl,
131   - sex: r.gender,
132   - store_id:os.stoid,
133   - },
134   - success: function(a) {
135   - if(a.data.code==0){
136   - wx.setStorageSync("isAuth", !0),
137   - e.globalData.userInfo = a.data.data,
138   - e.globalData.user_id = e.globalData.userInfo.user_id, e.globalData.userInfo.head_pic = i.getFullUrl(e.globalData.userInfo.head_pic),
139   - "function" == typeof cb && cb(e.globalData.userInfo, e.globalData.wechatUser);
140   - e.showWarning("绑定成功");
141   - setTimeout(function(){
142   - wx.navigateTo({
143   - url: '/pages/user/index/index',
144   - })
145   - },1000);
146   - }else{
147   - e.showWarning("请输入验证码")
148   - }
149   - }
150   - }) : e.showWarning("请输入验证码") : e.showWarning("请输入手机号码");
151   - },
152   -
153   - bindReg: function() {
154   - var t = this;
155   - if( "" != this.data.regMobile ){
156   - e.showWarning("请输入手机号码"); return false;
157   - }else if( "" != this.data.regCode){
158   - e.showWarning("请输入验证码"); return false;
159   - }else {
160   - var openid = getApp().globalData.openid;
161   - var r = getApp().globalData.getu;
162   - a.post("/api/weshop/users/thirdLogin", {
163   - data: {
164   - mobile: t.data.regMobile,
165   - verify_code: t.data.regCode,
166   - openid: openid,
167   - nickname: r.nickName,
168   - head_pic: r.avatarUrl,
169   - sex: r.gender,
170   - },
171   - success: function(a) {
172   - console.log("thirdLogin");
173   - console.log(e);
174   - if (e.data.code == 0) {
175   - app.globalData.user_id = e.data.data.user_id;
176   - } else {
177   - return app.showWarning("授权登入失败！");
178   - }
179   - wx.setStorageSync("isAuth", !0), a.globalData.userInfo = e.data.data, a.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
180   - wx.navigateBack({ delta: 1 })
181   - }
182   - })
183   - }
184   - }
185   -});
186   -
187   -function randomNum(min, max) {
188   - return Math.floor(Math.random() * (max - min) + min);
189   -}
190   -/**生成一个随机色**/
191   -function randomColor(min, max) {
192   - var r = randomNum(min, max);
193   - var g = randomNum(min, max);
194   - var b = randomNum(min, max);
195   - return "rgb(" + r + "," + g + "," + b + ")";
196   -}
197   -
198   -/**绘制验证码图片**/
199   -function drawPic(that) {
200   - ctx = wx.createCanvasContext('canvas');
201   - /**绘制背景色**/
202   - ctx.fillStyle = randomColor(180, 240); //颜色若太深可能导致看不清
203   - ctx.fillRect(0, 0, 90, 28)
204   - /**绘制文字**/
205   - var arr;
206   - var text = '';
207   - var str = 'ABCEFGHJKLMNPQRSTWXY123456789';
208   - for (var i = 0; i < 4; i++) {
209   - var txt = str[randomNum(0, str.length)];
210   - ctx.fillStyle = randomColor(50, 160); //随机生成字体颜色
211   - ctx.font = randomNum(20, 26) + 'px SimHei'; //随机生成字体大小
212   - var x = 5 + i * 20;
213   - var y = randomNum(20, 25);
214   - var deg = randomNum(-20, 20);
215   - //修改坐标原点和旋转角度
216   - ctx.translate(x, y);
217   - ctx.rotate(deg * Math.PI / 180);
218   - ctx.fillText(txt, 5, 0);
219   - text = text + txt;
220   - //恢复坐标原点和旋转角度
221   - ctx.rotate(-deg * Math.PI / 180);
222   - ctx.translate(-x, -y);
223   - }
224   - /**绘制干扰线**/
225   - for (var i = 0; i < 4; i++) {
226   - ctx.strokeStyle = randomColor(40, 180);
227   - ctx.beginPath();
228   - ctx.moveTo(randomNum(0, 90), randomNum(0, 28));
229   - ctx.lineTo(randomNum(0, 90), randomNum(0, 28));
230   - ctx.stroke();
231   - }
232   - /**绘制干扰点**/
233   - for (var i = 0; i < 20; i++) {
234   - ctx.fillStyle = randomColor(0, 255);
235   - ctx.beginPath();
236   - ctx.arc(randomNum(0, 90), randomNum(0, 28), 1, 0, 2 * Math.PI);
237   - ctx.fill();
238   - }
239   - ctx.draw(false, function () {
240   - that.setData({
241   - text: text
242   - })
243   - });
244   -}
245 0 \ No newline at end of file
pages/user/binding_info/binding_info.json deleted
View file @0096f66
1   -{
2   - "navigationBarTitleText": "关联手机号",
3   - "enablePullDownRefresh": false
4   -}
5 0 \ No newline at end of file
pages/user/binding_info/binding_info.wxml deleted
View file @0096f66
1   -<view>
2   - <view class="binding-top" style="background-image:url('{{iurl}}/miniapp/images/binding-bj.png')">
3   - <view class="user-logo">
4   - <image src="{{imghots+store.store_logo}}"></image>
5   - </view>
6   - <view class="user-text">
7   - <text>{{store.store_name}}</text>
8   -
9   - </view>
10   - <view class="userbj-cover">
11   - <image src="{{iurl}}/miniapp/images/white-cover.png"></image>
12   - </view>
13   - </view>
14   - <view class="binding-container">
15   - <!-- <view class="binding-tips">
16   - <text>为了给您更好地服务，请关注一个TPshop账号
17   -若还没有TPshop账号，则注册后默认完成关联</text>
18   - </view> -->
19   - <view>
20   - <!-- <view class="correlation-cont">
21   - <view bindtap="account" class="connect-item {{isRegist?'':'tp-list-bg'}}">关联已有账号</view>
22   - <view bindtap="regist" class="connect-item {{isRegist?'tp-list-bg':''}}">注册并关联账号</view>
23   - </view> -->
24   -
25   - <view class="correlation-input-wrap">
26   - <view class="items-warp" hidden="{{isRegist}}">
27   - <view class="item_cont">
28   - <image src="{{iurl}}/miniapp/images/numb.png"></image>
29   - <text>手机号码</text>
30   - <input bindinput="setMobile" id="username" name="username" placeholder="请输入手机号码" type="number"></input>
31   - </view>
32   -
33   - <view class="item_cont ">
34   - <image src="{{iurl}}/miniapp/images/code.png"></image>
35   - <text decode="{{true}}" space="{{true}}">验&nbsp;证&nbsp;&nbsp;码</text>
36   - <input bindinput="setCode" id="password" name="password" placeholder="请输入验证码" type="number"></input>
37   - <button wx:if="{{canGetCode}}" class="tp-get-gode btn-disable">
38   - {{gettime>0?gettime:""}}秒后重发
39   - </button>
40   - <button wx:else bindtap="getCode" class="tp-get-gode"> 获取验证码</button>
41   - </view>
42   - <view class="item-cont">
43   - <button bindtap="bindAccount" class="correlation-submit">立即绑定</button>
44   - </view>
45   - </view>
46   - <view class="items-warp" hidden="{{!isRegist}}">
47   - <view class="item_cont">
48   - <image src="{{iurl}}/miniapp/images/numb.png"></image>
49   - <text>手机号码</text>
50   - <input bindinput="setRegMobile" id="username" name="username" placeholder="请输入手机号码" type="number"></input>
51   - </view>
52   - <view class="item_cont ">
53   - <image src="{{iurl}}/miniapp/images/password.png"></image>
54   - <text>设置密码</text>
55   - <input bindinput="setRegPwd" id="username" name="username" placeholder="字母和数字组成的6-16位字符" type="password"></input>
56   - </view>
57   - <view class="item_cont">
58   - <image src="{{iurl}}/miniapp/images/code.png"></image>
59   - <text decode="{{true}}" space="{{true}}">验&nbsp;证&nbsp;&nbsp;码</text>
60   - <input bindinput="setRegCode" id="password" name="password" placeholder="请输入验证码" type="number"></input>
61   - <button bindtap="getRegCode" class="tp-get-gode">获取验证码</button>
62   - </view>
63   - <view class="item-cont">
64   - <button bindtap="bindReg" class="correlation-submit">立即绑定</button>
65   - </view>
66   - </view>
67   - </view>
68   - </view>
69   - <view class="bingding-agreement" hidden="{{!isRegist}}">
70   - <checkbox bindtap="check" checked="{{isAgree}}"></checkbox>
71   - <label>我已阅读并同意</label>
72   - <navigator>《TPshop商城用户注册协议》</navigator>
73   - </view>
74   - </view>
75   -</view>
76   -
77   -
pages/user/binding_info/binding_info.wxss deleted
View file @0096f66
1   -page {
2   - background-color: #fff;
3   -}
4   -
5   -.binding-top {
6   - width: 100%;
7   - height: 450rpx;
8   - text-align: center;
9   - position: relative;
10   - overflow: hidden;
11   -}
12   -
13   -.user-logo {
14   - width: 190rpx;
15   - height: 190rpx;
16   - border-radius: 50%;
17   - border: 2px solid #fff;
18   - overflow: hidden;
19   - position: absolute;
20   - left: 50%;
21   - margin-left: -95rpx;
22   - top: 60rpx;
23   -}
24   -
25   -.user-logo image {
26   - width: 100%;
27   - height: 100%;
28   -}
29   -
30   -.user-text {
31   - margin-top: 142px;
32   -}
33   -
34   -.user-text text {
35   - display: block;
36   - margin-top: 16rpx;
37   - color: #fff;
38   -}
39   -
40   -.userbj-cover {
41   - width: 100%;
42   - height: 46rpx;
43   - position: absolute;
44   - left: 0;
45   - bottom: 0;
46   - z-index: 20;
47   -}
48   -
49   -.userbj-cover image {
50   - width: 100%;
51   - height: 46rpx;
52   -}
53   -
54   -.binding-container {
55   - width: 100%;
56   - padding-top: 15px;
57   -}
58   -
59   -.binding-tips {
60   - font-size: 14px;
61   - color: #666;
62   - text-align: center;
63   - letter-spacing: 2rpx;
64   -}
65   -
66   -.correlation-cont {
67   - width: 600rpx;
68   - margin: 0 auto;
69   - margin-top: 40rpx;
70   - overflow: hidden;
71   -}
72   -
73   -.connect-item {
74   - width: 296rpx;
75   - height: 78rpx;
76   - line-height: 78rpx;
77   - font-size: 16px;
78   - text-align: center;
79   - border: 1px solid #b7b7b7;
80   - float: left;
81   -}
82   -
83   -.correlation-cont .connect-item:first-child {
84   - border-bottom-left-radius: 30px;
85   - border-top-left-radius: 30px;
86   -}
87   -
88   -.correlation-cont .connect-item:last-child {
89   - border-bottom-right-radius: 30px;
90   - border-top-right-radius: 30px;
91   -}
92   -
93   -.tp-list-bg {
94   - color: #fff;
95   - background: #e23435;
96   - border: 1px solid #e23435!important;
97   -}
98   -
99   -.correlation-input-wrap {
100   - margin-top: 56rpx;
101   - width: 100%;
102   -}
103   -
104   -.item_cont {
105   - width: 660rpx;
106   - height: 96rpx;
107   - margin: 0 auto;
108   - position: relative;
109   - line-height: 96rpx;
110   - border-bottom: 1px solid #e6e6e6;
111   -}
112   -
113   -.item_cont image {
114   - width: 48rpx;
115   - height: 48rpx;
116   - vertical-align: middle;
117   -}
118   -
119   -.item_cont text {
120   - font-size: 16px;
121   - vertical-align: middle;
122   - color: #666;
123   - margin-left: 16rpx;
124   -}
125   -
126   -.item_cont input {
127   - border: 0px;
128   - font-size: 16px;
129   - height: 50rpx;
130   - line-height: 50rpx;
131   - display: inline-block;
132   - vertical-align: middle;
133   - width: 432rpx;
134   - margin-left: 30rpx;
135   -}
136   -
137   -.tp-get-gode {
138   - position: absolute;
139   - right: 0;
140   - top: 20rpx;
141   - border-radius: 30rpx;
142   - background-color: #f05052;
143   - color: #fff;
144   - height: 56rpx;
145   - width: 140rpx;
146   - font-size: 22rpx;
147   - line-height: 56rpx;
148   - z-index: 50;
149   -}
150   -.tp-get-gode.btn-disable{
151   - background-color: #e6e6e6;
152   - color: #999;
153   -}
154   -
155   -.correlation-submit {
156   - width: 660rpx;
157   - height: 96rpx;
158   - line-height: 96rpx;
159   - background: #db261e;
160   - border: none;
161   - border-radius: 6px;
162   - color: #ffffff;
163   - font-size: 20px;
164   - margin-top: 40rpx;
165   -}
166   -
167   -.bingding-agreement {
168   - width: 660rpx;
169   - margin: 0 auto;
170   - margin-top: 20rpx;
171   - font-size: 14px;
172   - margin-bottom: 30px;
173   -}
174   -
175   -.bingding-agreement label {
176   - vertical-align: middle;
177   - color: #333;
178   - margin-left: 10rpx;
179   -}
180   -
181   -.bingding-agreement navigator {
182   - vertical-align: middle;
183   - color: #0094ca;
184   - display: inline-block;
185   -}
186   -
187   -checkbox .wx-checkbox-input {
188   - border-radius: 50%;
189   - width: 36rpx;
190   - height: 36rpx;
191   -}
192   -
193   -checkbox .wx-checkbox-input.wx-checkbox-input-checked {
194   - border: none;
195   - background: red;
196   - width: 40rpx;
197   - height: 40rpx;
198   -}
199   -
200   -checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
201   - border-radius: 50%;
202   - width: 36rpx;
203   - height: 36rpx;
204   - line-height: 36rpx;
205   - text-align: center;
206   - font-size: 30rpx;
207   - color: #fff;
208   - background: transparent;
209   - transform: translate(-50%,-50%) scale(1);
210   -}
211 0 \ No newline at end of file