Merge branch 'dev' into 'test'

Dev See merge request !326

Merge branch 'dev' into 'test'
Dev See merge request !326
后端研发-苏明海
2 parents e7a4f97f 75aec6ef
Showing 10 changed files with 43 additions and 88 deletions
app.json
pages/activity/pind_list/pind_list.js
pages/activity/seckill_list/seckill_list.js
pages/goods/categoryList/categoryList.js
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
pages/user/recharge/recharge.js
pages/user/recharge/recharge.json
pages/user/recharge/recharge.wxml
pages/user/recharge/recharge.wxss
@@ -24,7 +24,6 @@
     "pages/user/return_goods_info/return_goods_info",
     "pages/user/return_goods/return_goods",
     "pages/user/withdrawals/withdrawals",
-    "pages/user/recharge/recharge",
     "pages/user/express/express",
     "pages/user/binding_info/binding_info",
     "pages/user/get_user_info/get_user_info",
@@ -83,9 +82,20 @@
     "pages/user/assistance/friend_assistance",
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance"
- 
  
   ],
+    "subPackages": [
+      {
+        "root": "packageA/",
+        "pages": [],
+        "plugins": {
+          "live-player-plugin": {
+            "version": "1.0.2",
+            "provider": "wx2b03c6e691cd7370"
+          }
+        }
+      }
+    ],
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
@@ -126,6 +126,13 @@ Page({
        this.reloadGoodList();
     },
  
+  //---------分享配置--------
+  onShareAppMessage: function (e) {
+    return {
+      title: "限时团购",
+    }
+  },
+
     //图片失败，默认图片
     bind_bnerr2: function (e) {
        var _errImg = e.target.dataset.errorimg;
@@ -123,6 +123,12 @@ Page({
        this.setData({type:a,goodlist:null});
        this.reloadGoodList();
     },
+  //---------分享配置--------
+  onShareAppMessage: function (e) {
+    return {
+      title: "疯狂秒杀",
+    }
+  },
     //图片失败，默认图片
     bind_bnerr2: function (e) {
        var _errImg = e.target.dataset.errorimg;
@@ -417,7 +417,12 @@ Page({
       }
     });
   },
-  
+  //---------分享配置--------
+  onShareAppMessage: function (e) {
+    return {
+      title: "商品分类",
+    }
+  },
   //图片失败，默认图片
    bind_bnerr: function (e) {
     var _errImg = e.target.dataset.errorimg;
@@ -137,7 +137,12 @@ Page({
         });
         this.data.currentPage = 2;
     },
-    
+//---------分享配置--------
+  onShareAppMessage: function (e) {
+    return {
+      title: "商品列表",
+    }
+  },
     //---图片失败，默认图片---
     bind_bnerr2: function (e) {
     var _errImg = e.target.dataset.errorimg;
@@ -175,6 +175,12 @@ Page({
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },
+ //---------分享配置--------
+  onShareAppMessage: function (e) {
+    return {
+      title: "商品分类",
+    }
+  },
     //---------图片失败，默认图片--------
     bind_bnerr: function (e) {
       var _errImg = e.target.dataset.errorimg;
-var e = getApp(), a = require("../../../utils/pay.js");
-
-Page({
-    data: {
-        userMoney: 0,
-        iurl:e.globalData.setting.imghost,
-    },
-    onLoad: function(e) {
-        this.setData({
-            userMoney: e.money
-        });
-    },
-    submitRechange: function(n) {
-        var t = parseFloat(n.detail.value.money);
-        if (console.log(t), isNaN(t) || t < .01) return e.showWarning("请输入有效的金额");
-        a.rechange(t, function() {
-            wx.navigateBack();
-        });
-    }
-});
 \ No newline at end of file
-{
-    "navigationBarTitleText": "充值"
-}
 \ No newline at end of file
-<form bindsubmit="submitRechange">
-    <view class="pd-bg-fff">
-        <view class="balance">
-            您的当前余额 :  <text class="co-red">{{userMoney}}</text> 元 
-        </view>
-        <view class="recharge">
-            <view class="title">充值金额 : </view>
-            <input autoFocus name="money" placeholder="0.00" type="digit"></input>
-        </view>
-        <view class="recharge recharge-way">
-            <view>充值方式 : </view>
-            <view class="pic-wrap">
-                <image class="wh100" src="{{iurl}}/miniapp/images/wx-pay2.png"></image>
-            </view>
-        </view>
-    </view>
-    <button class="recharge-btns" formType="submit">充 值</button>
-</form>
-.balance {
-    font-size: 28rpx;
-    line-height: 64rpx;
-    color: #444;
-    border-bottom: 1px solid #ddd;
-}
-
-.recharge {
-    display: flex;
-    align-items: center;
-    height: 120rpx;
-    font-size: 28rpx;
-    color: #444;
-    border-bottom: 1px solid #ddd;
-}
-
-.recharge .title {
-    word-break: keep-all;
-    white-space: nowrap;
-}
-
-.recharge input {
-    height: 120rpx;
-    margin-left: 30rpx;
-}
-
-.pic-wrap {
-    margin-left: 30rpx;
-    width: 240rpx;
-    height: 72rpx;
-}
-
-.recharge-btns {
-    margin: 60rpx auto 0;
-    width: 580rpx;
-    height: 88rpx;
-    font-size: 28rpx;
-    line-height: 88rpx;
-    text-align: center;
-    color: #fff;
-    background-color: #e30000;
-    border-radius: 8rpx;
-}
 \ No newline at end of file