wxd / MShopWeApp

Commit 57b142f3b5fcae7d7743ac33fa2f18b35388aedb

Authored by taiyuan
2 parents 7757f0cf 89136ad0

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

Inline Side-by-side
Showing 14 changed files with 304 additions and 158 deletions
packageA/images/1.jpg deleted
View file @7757f0c

181 KB
packageA/images/cloud.jpg deleted
View file @7757f0c

12 KB
packageA/pages/parseHtml/parseHtml.js
  View file @57b142f
1 1 var WxParse = require('../../../utils/wxParse/wxParse.js');
2 2  
3   -const app = getApp();
  3 +const app = getApp();
4 4 let self = null;
5 5 let content_privacy = `<div>
6 6 <p class="tac font16"><b>隐私政策</b><br /><br /></p>
... ... @@ -235,117 +235,126 @@ let content_use = `&lt;div&gt;
235 235  
236 236 Page({
237 237  
238   - /**
239   - * 页面的初始数据
240   - */
241   - data: {
242   - list: null,
243   - isLoading: false, // 检测是否已经发送请求,防止重复发送请求
244   - noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
245   - pageNum: 1, // 当前页数
246   - },
  238 + /**
  239 + * 页面的初始数据
  240 + */
  241 + data: {
  242 + list: null,
  243 + isLoading: false, // 检测是否已经发送请求,防止重复发送请求
  244 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
  245 + pageNum: 1, // 当前页数
  246 + },
247 247  
248   - /**
249   - * 生命周期函数--监听页面加载
250   - */
251   - onLoad: function (options) {
252   - self = this;
253   - let title = '';
254   - let content = '';
255   - if(options.t == 0) {
256   - title = '用户使用协议';
257   - content = content_use;
258   - } else if(options.t == 1) {
259   - title = '隐私政策';
260   - content = content_privacy;
261   - };
262   - wx.setNavigationBarTitle({
263   - title: title,
264   - });
  248 + /**
  249 + * 生命周期函数--监听页面加载
  250 + */
  251 + onLoad: function (options) {
  252 + self = this;
  253 + //-- 获取一下基础参数 --
  254 + getApp().getConfig2(function (res) {
  255 + if(res.reg_rule){ content_use=res.reg_rule; }
  256 + if(res.reg_privacy){ content_privacy=res.reg_privacy; }
265 257  
266   - WxParse.wxParse('content', 'html', content, self);
267   -
268   - },
  258 + let title = '';
  259 + let content = '';
  260 + if (options.t == 0) {
  261 + title = '用户使用协议';
  262 + content = content_use;
  263 + } else if (options.t == 1) {
  264 + title = '隐私政策';
  265 + content = content_privacy;
  266 + }
  267 + ;
  268 + wx.setNavigationBarTitle({
  269 + title: title,
  270 + });
269 271  
270   - /**
271   - * 生命周期函数--监听页面初次渲染完成
272   - */
273   - onReady: function () {
  272 + WxParse.wxParse('content', 'html', content, self);
274 273  
275   - },
  274 + }, 1)
276 275  
277   - /**
278   - * 生命周期函数--监听页面显示
279   - */
280   - onShow: function () {
  276 + },
281 277  
282   - },
  278 + /**
  279 + * 生命周期函数--监听页面初次渲染完成
  280 + */
  281 + onReady: function () {
283 282  
284   - /**
285   - * 生命周期函数--监听页面隐藏
286   - */
287   - onHide: function () {
  283 + },
288 284  
289   - },
  285 + /**
  286 + * 生命周期函数--监听页面显示
  287 + */
  288 + onShow: function () {
290 289  
291   - /**
292   - * 生命周期函数--监听页面卸载
293   - */
294   - onUnload: function () {
  290 + },
295 291  
296   - },
  292 + /**
  293 + * 生命周期函数--监听页面隐藏
  294 + */
  295 + onHide: function () {
297 296  
298   - /**
299   - * 页面相关事件处理函数--监听用户下拉动作
300   - */
301   - onPullDownRefresh: function () {
  297 + },
302 298  
303   - },
  299 + /**
  300 + * 生命周期函数--监听页面卸载
  301 + */
  302 + onUnload: function () {
304 303  
305   - /**
306   - * 页面上拉触底事件的处理函数
307   - */
308   - onReachBottom: function () {
  304 + },
309 305  
310   - },
  306 + /**
  307 + * 页面相关事件处理函数--监听用户下拉动作
  308 + */
  309 + onPullDownRefresh: function () {
311 310  
312   - /**
313   - * 用户点击右上角分享
314   - */
315   - onShareAppMessage: function () {
  311 + },
  312 +
  313 + /**
  314 + * 页面上拉触底事件的处理函数
  315 + */
  316 + onReachBottom: function () {
  317 +
  318 + },
  319 +
  320 + /**
  321 + * 用户点击右上角分享
  322 + */
  323 + onShareAppMessage: function () {
  324 +
  325 + },
  326 +
  327 + /**
  328 + * get请求数据
  329 + */
  330 + get(url, data) {
  331 + app.request.get(url + '/' + data.store_id, {
  332 + success: function (res) {
  333 + if (res.data.code == 0) {
  334 + console.log('success~~~~~~~~~~~', res);
  335 + self.setData({
  336 + content: res.data.data.distriRule,
  337 + });
  338 + /**
  339 + * WxParse.wxParse(bindName , type, data, target,imagePadding)
  340 + * 1.bindName绑定的数据名(必填)
  341 + * 2.type可以为html或者md(必填)
  342 + * 3.data为传入的具体数据(必填)
  343 + * 4.target为Page对象,一般为this(必填)
  344 + * 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
  345 + */
  346 + WxParse.wxParse('content', 'html', self.data.content, self);
  347 + } else {
  348 + wx.showToast({
  349 + title: "网络繁忙，请重试",
  350 + icon: 'none',
  351 + duration: 2000
  352 + })
  353 + }
  354 + },
  355 + fail: function () {
  356 + },
  357 + });
  358 + },
316 359  
317   - },
318   -
319   - /**
320   - * get请求数据
321   - */
322   - get(url, data) {
323   - app.request.get(url + '/' + data.store_id, {
324   - success: function(res) {
325   - if(res.data.code == 0){
326   - console.log('success~~~~~~~~~~~',res);
327   - self.setData({
328   - content: res.data.data.distriRule,
329   - });
330   - /**
331   - * WxParse.wxParse(bindName , type, data, target,imagePadding)
332   - * 1.bindName绑定的数据名(必填)
333   - * 2.type可以为html或者md(必填)
334   - * 3.data为传入的具体数据(必填)
335   - * 4.target为Page对象,一般为this(必填)
336   - * 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
337   - */
338   - WxParse.wxParse('content', 'html', self.data.content, self);
339   - }else{
340   - wx.showToast({
341   - title: "网络繁忙，请重试",
342   - icon: 'none',
343   - duration: 2000
344   - })
345   - }
346   - },
347   - fail: function() {},
348   - });
349   - },
350   -
351 360 })
352 361 \ No newline at end of file
... ...
packageA/pages/profile/profile.wxss
  View file @57b142f
... ... @@ -411,7 +411,6 @@ input {
411 411 background: white;
412 412 width: 100%;
413 413 border-radius: 20rpx 20rpx 0 0;
414   - height: 72%;
415 414 }
416 415  
417 416 .popup-top {
... ... @@ -452,7 +451,8 @@ input {
452 451  
453 452 .store-list {
454 453 width: 95%;
455   - height: 72%;
  454 + min-height: 300rpx;
  455 + max-height: 610rpx;
456 456 overflow-y: scroll;
457 457 margin: auto;
458 458 }
... ... @@ -506,7 +506,7 @@ input {
506 506 .store-bottom {
507 507 width: 85%;
508 508 margin: auto;
509   - height: 70rpx;
  509 + height: 90rpx;
510 510 }
511 511  
512 512 .determine {
... ...
pages/user/Change_phone/Change_phone.js renamed to packageB/pages/user/Change_phone/Change_phone.js
  View file @57b142f
... ... @@ -2,8 +2,8 @@ var a = getApp(),
2 2 o = a.globalData,
3 3 r = a.globalData.setting,
4 4 t = a.request,
5   - s = require("../../../utils/common.js"),
6   - util = require("../../../utils/util.js");
  5 + s = require("../../../../utils/common.js"),
  6 + util = require("../../../../utils/util.js");
7 7 Page({
8 8  
9 9 /**
... ...
pages/user/Change_phone/Change_phone.json renamed to packageB/pages/user/Change_phone/Change_phone.json
  View file @57b142f
pages/user/Change_phone/Change_phone.wxml renamed to packageB/pages/user/Change_phone/Change_phone.wxml
  View file @57b142f
pages/user/Change_phone/Change_phone.wxss renamed to packageB/pages/user/Change_phone/Change_phone.wxss
  View file @57b142f
pages/goods/goodsInfo/goodsInfo.js
  View file @57b142f
... ... @@ -2025,10 +2025,11 @@ Page({
2025 2025 }
2026 2026 var title= th.data.data.goods_name;
2027 2027 var img=th.data.data.original_img;
2028   - if(th.data.prom_type==6 || th.data.prom_type==1){
2029   -
  2028 + if(th.data.prom_type==6 || th.data.prom_type==1 || th.data.prom_type==4){
2030 2029 title=th.data.prom_act.share_title;
2031 2030 if(!title) title=th.data.prom_act.title;
  2031 + if(th.data.prom_type==4) title=th.data.prom_act.name;
  2032 +
2032 2033 if(th.data.prom_act.share_imgurl)
2033 2034 img=th.data.iurl+th.data.prom_act.share_imgurl;
2034 2035 }
... ... @@ -4070,9 +4071,10 @@ Page({
4070 4071 }
4071 4072  
4072 4073 var share_title=th.data.data.goods_name;
4073   - if(th.data.prom_type==1 || th.data.prom_type==6){
  4074 + if(th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4){
4074 4075 share_title=th.data.prom_act.share_title;
4075 4076 if(!share_title) share_title=th.data.prom_act.title;
  4077 + if(th.data.prom_type==4) share_title=th.data.prom_act.name;
4076 4078 }
4077 4079  
4078 4080 //---产品名称---
... ... @@ -4082,30 +4084,38 @@ Page({
4082 4084 context.setFontSize(21.3 * unit)
4083 4085 th.draw_Text(context, share_title,
4084 4086 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
  4087 +
4085 4088 //------产品的价格-------
4086 4089 context.setFontSize(23 * unit)
4087 4090 context.setFillStyle("red")
4088   - context.fillText("￥", 416 * unit, 185 * unit);
4089   - context.setFontSize(31 * unit)
  4091 +
  4092 +
4090 4093 var pri0 = th.data.data.shop_price;
4091 4094 if (th.data.prom_act)
4092 4095 pri0 = th.data.prom_act.price;
4093 4096 pri0 = parseFloat(pri0).toFixed(2);
4094   - context.fillText(pri0, 438 * unit, 185 * unit);
  4097 + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
  4098 + context.fillText("￥", wd1-15, 185 * unit);
  4099 + context.setFontSize(31 * unit)
  4100 + context.fillText(pri0, wd1, 185 * unit);
  4101 +
4095 4102 //---市场价划掉---
4096 4103 context.setFillStyle("gray")
4097 4104 context.setFontSize(22 * unit)
4098   - context.fillText("￥" + th.data.data.market_price.toFixed(2), 426 * unit, 213 * unit);
  4105 + pri0="￥" + th.data.data.market_price.toFixed(2);
  4106 + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
  4107 + context.fillText(pri0, wd2, 213 * unit);
  4108 +
4099 4109 context.setStrokeStyle('gray');
4100 4110 context.setLineWidth(1 * unit);
4101   - context.moveTo(426 * unit, 206 * unit);
4102   - context.lineTo(510 * unit, 206 * unit);
  4111 + context.moveTo(wd2-5, 206 * unit);
  4112 + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 206 * unit);
4103 4113 context.stroke();
4104 4114  
4105 4115 }else{
4106 4116 context.setFillStyle("black");
4107 4117 context.setFontSize(21.3 * unit)
4108   - th.draw_Text(context, th.data.data.goods_name,
  4118 + th.draw_Text(context, share_title,
4109 4119 38 * unit, 170 * unit, 20 * unit, 300*unit, unit);
4110 4120 //------ 产品的价格 -----
4111 4121 var pri0 = th.data.prom_act.addmoney;
... ... @@ -4396,28 +4406,31 @@ Page({
4396 4406 destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
4397 4407 destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
4398 4408 canvasId: 'share',
4399   - success: function(res) {
4400   - that.setData({
4401   - shareImgPath: res.tempFilePath,
4402   - canvasHidden: true
4403   - })
4404   - if (!res.tempFilePath) {
4405   - wx.showModal({
4406   - title: '提示',
4407   - content: '图片绘制中，请稍后重试',
4408   - showCancel: false
4409   - })
4410   - return false;
  4409 + success: function (res) {
  4410 +
  4411 + that.setData({
  4412 + shareImgPath: res.tempFilePath,
  4413 + canvasHidden: true
  4414 + })
  4415 +
  4416 + if (!res.tempFilePath) {
  4417 + wx.showModal({
  4418 + title: '提示',
  4419 + content: '图片绘制中，请稍后重试',
  4420 + showCancel: false
  4421 + })
  4422 + return false;
  4423 + }
  4424 +
  4425 + // wx.previewImage({
  4426 + // //将图片预览出来
  4427 + // urls: [that.data.shareImgPath]
  4428 + // });
  4429 + that.setData({
  4430 + showPoster: true,
  4431 + });
  4432 + wx.hideLoading();
4411 4433 }
4412   - // wx.previewImage({
4413   - // //将图片预览出来
4414   - // urls: [that.data.shareImgPath]
4415   - // });
4416   - that.setData({
4417   - showPoster: true,
4418   - });
4419   - wx.hideLoading();
4420   - }
4421 4434 })
4422 4435 }, 500)
4423 4436  
... ... @@ -4544,7 +4557,7 @@ Page({
4544 4557  
4545 4558 var img_url=ee.data.data.original_img;
4546 4559 if((this.data.prom_type==1 || this.data.prom_type==6) && this.data.prom_act.share_imgurl){
4547   - img_url=this.data.iurl+this.data.prom_act.share_imgurl;
  4560 + img_url=this.data.iurl+this.data.prom_act.share_imgurl;
4548 4561 }
4549 4562  
4550 4563 //获取商品是分享图信息
... ...
pages/team/team_success/team_success.js
  View file @57b142f
... ... @@ -394,6 +394,12 @@ Page({
394 394 canvasHidden: true,
395 395 })
396 396  
  397 + if(this.data.share_hidden) {
  398 + this.setData({
  399 + share_hidden: false,
  400 + });
  401 + };
  402 +
397 403 var app = getApp();
398 404 var unit = that.data.screenWidth / 750 * 1.35;
399 405 var scene=th.data.teamgroup.id;
... ... @@ -415,16 +421,17 @@ Page({
415 421 var vpath = res.path;
416 422 var context = wx.createCanvasContext('share');
417 423  
418   - console.log("saveImageToPhotosAlbum");
419   - console.log(vpath);
420 424  
421 425 //先画背景
422 426 var pg_path = "../../../images/share/share_bg.png";
423 427 //-- 如果有自定义海报的时候，判断背景的图片 --
424 428 if(th.data.share_b_img){
425 429 pg_path=th.data.share_b_img;
426   - }
427   -
  430 + }
  431 +
  432 + var share_title=th.data.teamlist.share_title;
  433 + if(!share_title)
  434 + share_title=th.data.teamlist.title;
428 435 context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
429 436  
430 437 //-- 是自定义海报的情况下 --
... ... @@ -468,27 +475,35 @@ Page({
468 475 //---产品名称---
469 476 context.setFontSize(21.3 * unit);
470 477 context.setFillStyle("black");
471   - th.draw_Text(context, th.data.goods.goods_name,
  478 +
  479 +
  480 +
  481 +
  482 + th.draw_Text(context,share_title,
472 483 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
473 484 //------产品的价格-------
474 485 context.setFontSize(24 * unit)
475 486 context.setFillStyle("red")
476   - context.fillText("￥", 428 * unit, 180 * unit);
477   - context.setFontSize(31 * unit)
478   -
  487 +
479 488 var pri0 = th.data.teamlist.price;
480 489 pri0=parseFloat(pri0).toFixed(2);
481   - context.fillText(pri0, 456 * unit, 180 * unit);
  490 + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
  491 + context.fillText("￥", wd1-15, 180 * unit);
  492 + context.setFontSize(31 * unit)
  493 + context.fillText(pri0, wd1, 180 * unit);
  494 +
482 495 //---市场价划掉---
483 496 context.setFillStyle("gray")
484 497 context.setFontSize(22 * unit)
485   - context.fillText("￥" + th.data.goods.market_price, 438 * unit, 210 * unit);
  498 + pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
  499 + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
  500 + context.fillText(pri0, wd2, 210 * unit);
  501 +
486 502 context.setStrokeStyle('gray')
487 503 context.setLineWidth(1 * unit)
488   - context.moveTo(438 * unit, 204 * unit)
489   - context.lineTo(510 * unit, 204 * unit)
  504 + context.moveTo(wd2-5, 204 * unit)
  505 + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
490 506 context.stroke();
491   -
492 507 console.log(th.data.share_img_localpath);
493 508  
494 509  
... ... @@ -501,9 +516,9 @@ Page({
501 516 else{
502 517 g_ct= th.data.max_num -th.data.ordertx.length;
503 518 if(g_ct>0){
504   - wz="还差"+g_ct+"人享受最低价，";
  519 + wz="还差"+g_ct+"人享最低优惠，";
505 520 }else{
506   - wz="已享受最低价，";
  521 + wz="已享受最优惠，";
507 522 }
508 523 }
509 524  
... ... @@ -649,6 +664,7 @@ Page({
649 664 destHeight: 1217 * 750 / that.data.screenWidth,
650 665 canvasId: 'share',
651 666 success: function (res) {
  667 +
652 668 that.setData({
653 669 shareImgPath: res.tempFilePath, canvasHidden: false,
654 670 })
... ... @@ -660,10 +676,16 @@ Page({
660 676 })
661 677 return false;
662 678 }
663   - wx.previewImage({
664   - //将图片预览出来
665   - urls: [that.data.shareImgPath]
  679 +
  680 + // wx.previewImage({
  681 + // //将图片预览出来
  682 + // urls: [that.data.shareImgPath]
  683 + // });
  684 +
  685 + that.setData({
  686 + showPoster: true,
666 687 });
  688 +
667 689 wx.hideLoading();
668 690 }
669 691 })
... ... @@ -807,9 +829,14 @@ Page({
807 829 }
808 830 // console.log('url+++++>>>>>', url, th.data.teamlist.title);
809 831  
  832 + var share_title=th.data.teamlist.title;
  833 + if(th.data.teamlist.share_title){
  834 + share_title=th.data.teamlist.share_title;
  835 + }
  836 +
810 837 return {
811 838 path:url,
812   - title: th.data.teamlist.title,
  839 + title: share_title,
813 840 imageUrl: img,
814 841 }
815 842 },
... ... @@ -832,6 +859,13 @@ Page({
832 859 });
833 860 },
834 861  
  862 +
  863 + closePoster() {
  864 + this.setData({
  865 + showPoster: false,
  866 + });
  867 + },
  868 +
835 869  
836 870 })
837 871  
... ...
pages/team/team_success/team_success.wxml
  View file @57b142f
... ... @@ -322,3 +322,24 @@
322 322  
323 323 <!-- 分享控件，底部弹出 -->
324 324 <share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
  325 +
  326 +
  327 +<view wx:if="{{showPoster}}">
  328 + <view class="mask" catchtap="closePoster"></view>
  329 + <view class="poster-container">
  330 + <view class="poster-wrapper">
  331 + <view class="poster">
  332 + <!-- <view class="poster" bindtap="previewImage"> -->
  333 + <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
  334 + <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
  335 + </view>
  336 + <!-- <view class="btn-container">
  337 + <button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
  338 + <button class="btn-share" bindtap="savePic">保存到相册</button>
  339 + </view> -->
  340 + </view>
  341 + </view>
  342 +</view>
  343 +
  344 +
  345 +
... ...
pages/team/team_success/team_success.wxss
  View file @57b142f
... ... @@ -892,5 +892,74 @@ height:40rpx;
892 892 }
893 893 .xc-shuoming{
894 894 padding-left:10rpx;
  895 +}
  896 +
  897 +
  898 +.poster-container {
  899 + box-sizing: border-box;
  900 + position: fixed;
  901 + top: 50%;
  902 + left: 50%;
  903 + transform: translate(-50%, -50%);
  904 + width: calc(100% - 120rpx);
  905 + z-index: 1000;
  906 +}
  907 +.mask {
  908 + position: fixed;
  909 + top: 0;
  910 + left: 0;
  911 + width: 100%;
  912 + height: 100%;
  913 + z-index: 999;
  914 + background-color: rgba(0,0,0,.4);
  915 +}
  916 +.poster-wrapper {
  917 + width: 100%;
  918 +}
  919 +
  920 +.poster {
  921 + box-sizing: border-box;
  922 + width: 100%;
  923 + height: 1055rpx;
  924 + border-radius: 20rpx;
  925 + /* box-shadow: 0 8px 12px #666; */
  926 + position: relative;
  927 + z-index: 999;
  928 + overflow: hidden;
  929 +}
  930 +.poster-img {
  931 + display: block;
  932 + width: 100%;
  933 + height: 100%;
  934 +}
  935 +.btn-container {
  936 + display: flex;
  937 + justify-content: space-around;
  938 +}
  939 +.btn-share {
  940 + display: block;
  941 + background-color: #FE6867;
  942 + color: white;
  943 + border-radius: 8rpx;
  944 + line-height: 80rpx;
  945 + margin-top: 28rpx;
  946 + padding: 0 60rpx;
  947 +}
  948 +
  949 +
  950 +.btn-close {
  951 + /* background-color: rgba(0,0,0,.5); */
  952 + color: #ccc;
  953 + width: 50rpx;
  954 + height: 50rpx;
  955 + line-height: 50rpx;
  956 + text-align: center;
  957 + border-radius: 50%;
  958 + position: absolute;
  959 + right: 20rpx;
  960 + top: 20rpx;
  961 +}
895 962  
  963 +.icon-close {
  964 + font-size: 48rpx;
896 965 }
897 966 \ No newline at end of file
... ...
pages/user/userinfo/userinfo.wxml
  View file @57b142f
... ... @@ -166,7 +166,7 @@
166 166 <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" />
167 167 </block> -->
168 168 </view>
169   - <view data-url="/pages/user/Change_phone/Change_phone" bindtap="go_phone" class="user-name flex-vertical-between" data-type="mobile">
  169 + <view data-url="/packageB/pages/user/Change_phone/Change_phone" bindtap="go_phone" class="user-name flex-vertical-between" data-type="mobile">
170 170 <view class="user-name-txt">更换手机</view>
171 171 <view class="flex-center user-txt-right">
172 172 <view class="flex">{{phone}}</view>
... ...
pages/user/userinfo/userinfo.wxss
  View file @57b142f
... ... @@ -408,7 +408,6 @@ input {
408 408 background: white;
409 409 width: 100%;
410 410 border-radius: 20rpx 20rpx 0 0;
411   - height: 72%;
412 411 }
413 412  
414 413 .popup-top {
... ... @@ -449,7 +448,8 @@ input {
449 448  
450 449 .store-list {
451 450 width: 95%;
452   - height: 72%;
  451 + min-height: 300rpx;
  452 + max-height: 610rpx;
453 453 overflow-y: scroll;
454 454 margin: auto;
455 455 }
... ... @@ -503,7 +503,7 @@ input {
503 503 .store-bottom {
504 504 width: 85%;
505 505 margin: auto;
506   - height: 70rpx;
  506 + height: 90rpx;
507 507 }
508 508  
509 509 .determine {
... ...