wxd / MShopWeApp

Merged
Merge Request #326 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 10 changed files
app.json
  Edit  View file @75aec6e
... ... @@ -24,7 +24,6 @@
24 24 "pages/user/return_goods_info/return_goods_info",
25 25 "pages/user/return_goods/return_goods",
26 26 "pages/user/withdrawals/withdrawals",
27   - "pages/user/recharge/recharge",
28 27 "pages/user/express/express",
29 28 "pages/user/binding_info/binding_info",
30 29 "pages/user/get_user_info/get_user_info",
... ... @@ -83,9 +82,20 @@
83 82 "pages/user/assistance/friend_assistance",
84 83 "pages/user/assistance/assistance_success",
85 84 "pages/user/assistance/assistance"
86   -
87 85  
88 86 ],
  87 + "subPackages": [
  88 + {
  89 + "root": "packageA/",
  90 + "pages": [],
  91 + "plugins": {
  92 + "live-player-plugin": {
  93 + "version": "1.0.2",
  94 + "provider": "wx2b03c6e691cd7370"
  95 + }
  96 + }
  97 + }
  98 + ],
89 99 "permission": {
90 100 "scope.userLocation": {
91 101 "desc": "获取你的位置信息"
... ...
pages/activity/pind_list/pind_list.js
  Edit  View file @75aec6e
... ... @@ -126,6 +126,13 @@ Page({
126 126 this.reloadGoodList();
127 127 },
128 128  
  129 + //---------分享配置--------
  130 + onShareAppMessage: function (e) {
  131 + return {
  132 + title: "限时团购",
  133 + }
  134 + },
  135 +
129 136 //图片失败，默认图片
130 137 bind_bnerr2: function (e) {
131 138 var _errImg = e.target.dataset.errorimg;
... ...
pages/activity/seckill_list/seckill_list.js
  Edit  View file @75aec6e
... ... @@ -123,6 +123,12 @@ Page({
123 123 this.setData({type:a,goodlist:null});
124 124 this.reloadGoodList();
125 125 },
  126 + //---------分享配置--------
  127 + onShareAppMessage: function (e) {
  128 + return {
  129 + title: "疯狂秒杀",
  130 + }
  131 + },
126 132 //图片失败，默认图片
127 133 bind_bnerr2: function (e) {
128 134 var _errImg = e.target.dataset.errorimg;
... ...
pages/goods/categoryList/categoryList.js
  Edit  View file @75aec6e
... ... @@ -417,7 +417,12 @@ Page({
417 417 }
418 418 });
419 419 },
420   -
  420 + //---------分享配置--------
  421 + onShareAppMessage: function (e) {
  422 + return {
  423 + title: "商品分类",
  424 + }
  425 + },
421 426 //图片失败，默认图片
422 427 bind_bnerr: function (e) {
423 428 var _errImg = e.target.dataset.errorimg;
... ...
pages/goods/goodsList/goodsList.js
  Edit  View file @75aec6e
... ... @@ -137,7 +137,12 @@ Page({
137 137 });
138 138 this.data.currentPage = 2;
139 139 },
140   -
  140 +//---------分享配置--------
  141 + onShareAppMessage: function (e) {
  142 + return {
  143 + title: "商品列表",
  144 + }
  145 + },
141 146 //---图片失败，默认图片---
142 147 bind_bnerr2: function (e) {
143 148 var _errImg = e.target.dataset.errorimg;
... ...
pages/goods/search/search.js
  View file @75aec6e
... ... @@ -175,6 +175,12 @@ Page({
175 175 if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
176 176 this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
177 177 },
  178 + //---------分享配置--------
  179 + onShareAppMessage: function (e) {
  180 + return {
  181 + title: "商品分类",
  182 + }
  183 + },
178 184 //---------图片失败，默认图片--------
179 185 bind_bnerr: function (e) {
180 186 var _errImg = e.target.dataset.errorimg;
... ...
pages/user/recharge/recharge.js deleted
View file @889dbdb
1   -var e = getApp(), a = require("../../../utils/pay.js");
2   -
3   -Page({
4   - data: {
5   - userMoney: 0,
6   - iurl:e.globalData.setting.imghost,
7   - },
8   - onLoad: function(e) {
9   - this.setData({
10   - userMoney: e.money
11   - });
12   - },
13   - submitRechange: function(n) {
14   - var t = parseFloat(n.detail.value.money);
15   - if (console.log(t), isNaN(t) || t < .01) return e.showWarning("请输入有效的金额");
16   - a.rechange(t, function() {
17   - wx.navigateBack();
18   - });
19   - }
20   -});
21 0 \ No newline at end of file
pages/user/recharge/recharge.json deleted
View file @889dbdb
1   -{
2   - "navigationBarTitleText": "充值"
3   -}
4 0 \ No newline at end of file
pages/user/recharge/recharge.wxml deleted
View file @889dbdb
1   -<form bindsubmit="submitRechange">
2   - <view class="pd-bg-fff">
3   - <view class="balance">
4   - 您的当前余额 : <text class="co-red">{{userMoney}}</text> 元
5   - </view>
6   - <view class="recharge">
7   - <view class="title">充值金额 : </view>
8   - <input autoFocus name="money" placeholder="0.00" type="digit"></input>
9   - </view>
10   - <view class="recharge recharge-way">
11   - <view>充值方式 : </view>
12   - <view class="pic-wrap">
13   - <image class="wh100" src="{{iurl}}/miniapp/images/wx-pay2.png"></image>
14   - </view>
15   - </view>
16   - </view>
17   - <button class="recharge-btns" formType="submit">充 值</button>
18   -</form>
pages/user/recharge/recharge.wxss deleted
View file @889dbdb
1   -.balance {
2   - font-size: 28rpx;
3   - line-height: 64rpx;
4   - color: #444;
5   - border-bottom: 1px solid #ddd;
6   -}
7   -
8   -.recharge {
9   - display: flex;
10   - align-items: center;
11   - height: 120rpx;
12   - font-size: 28rpx;
13   - color: #444;
14   - border-bottom: 1px solid #ddd;
15   -}
16   -
17   -.recharge .title {
18   - word-break: keep-all;
19   - white-space: nowrap;
20   -}
21   -
22   -.recharge input {
23   - height: 120rpx;
24   - margin-left: 30rpx;
25   -}
26   -
27   -.pic-wrap {
28   - margin-left: 30rpx;
29   - width: 240rpx;
30   - height: 72rpx;
31   -}
32   -
33   -.recharge-btns {
34   - margin: 60rpx auto 0;
35   - width: 580rpx;
36   - height: 88rpx;
37   - font-size: 28rpx;
38   - line-height: 88rpx;
39   - text-align: center;
40   - color: #fff;
41   - background-color: #e30000;
42   - border-radius: 8rpx;
43   -}
44 0 \ No newline at end of file