diff --git a/images/share/miao_share.png b/images/share/miao_share.png
index f788197..45f6493 100644
--- a/images/share/miao_share.png
+++ b/images/share/miao_share.png
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f7d7b11..5d88125 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -668,7 +668,10 @@ Page({
th.setData({collocation_goods:gg.collocation_goods});
var cart_arr=new Array();
- var narr=gg.collocation_goods;
+ //var narr=gg.collocation_goods;
+ //修改成深拷贝，确保返回是数据正确
+ var narr=JSON.parse(JSON.stringify(gg.collocation_goods));
+
narr.push(t.data.data);
var ie = {
pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,
diff --git a/pages/justTest/justTest.js b/pages/justTest/justTest.js
deleted file mode 100644
index c36aff5..0000000
--- a/pages/justTest/justTest.js
+++ /dev/null
@@ -1,177 +0,0 @@
-// pages/justTest/justTest.js
-// let livePlayer = requirePlugin('live-player-plugin');
-
-
-var t = require("../../utils/util.js"),
- ut = t,
- e = require("../../utils/common.js"),
- a = require("../../utils/wxParse/wxParse.js"),
- s = getApp(),
- i = s.request,
- rq = i,
- oo = s.globalData,
- o = s.globalData.setting,
- os = o;
-var utils = require('../../utils/util.js'),ut=utils;
-var regeneratorRuntime = require('../../utils/runtime.js');
-
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- gid: "",
- stoid: o.stoid,
- url: o.url,
- resourceUrl: o.resourceUrl,
- iurl: o.imghost,
- defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
- data: null,
- openSpecModal: !1,
- openPromModal: !1,
- supportPageScroll: !1,
-
- //联系电话
- mobile: '',
- bconfig:null,
- sales_rules:1,
-
- t_time:null,
- card_field:"",
- dp_price:0,
- cut_price:0,
- open_ind_store:1,
- goodsInputNum:1,
- g_buy_num: null,
- sele_collocation:null,
-
-
-
- photoUrl: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1003256280,1176261798&fm=26&gp=0.jpg",
- //（用来控制显示哪个按钮） false表示还没首次进行弹框授权，或者已经授权了；true表示在首次授权弹框时拒绝授权，或者在设置页面还是拒绝了授权
- isAuthSavePhoto: false
- },
-
-
-
-
-
- sendRequest: function () {
-
-
-
- //调用接口判断是不是会员
- getApp().request.promiseGet("/api/weshop/wx/livelist/page",{
- data:{store_id: 1}
- }).then(res=>{
- console.log(res);
- // if(res.data.code==0){
- // getApp().globalData.guide_id=res.data.data.id;
- // }
- })
-
- },
- // nav: function () {
- // wx.redirectTo({
- // url: '/packageA/pages/liveStream/liveStream'
- // })
- // },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
-
-
-
-
- saveImage() {
- wx.showLoading({
- title: '保存中...',
- mask: true,
- });
- wx.downloadFile({
- url:
- 'http://upload.jianshu.io/admin_banners/web_images/4435/c1d3ca63353c8bd527f0d781605516cb5b266d02.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/1250/h/540',
- success: function(res) {
- if (res.statusCode === 200) {
- let img = res.tempFilePath;
- wx.saveImageToPhotosAlbum({
- filePath: img,
- success(res) {
- wx.showToast({
- title: '保存成功',
- icon: 'success',
- duration: 2000
- });
- },
- fail(res) {
- wx.showToast({
- title: '保存失败',
- icon: 'success',
- duration: 2000
- });
- }
- });
- }
- }
- });
- },
-
-
-
- live() {}
-
-
-})
\ No newline at end of file
diff --git a/pages/justTest/justTest.json b/pages/justTest/justTest.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/justTest/justTest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/justTest/justTest.wxml b/pages/justTest/justTest.wxml
deleted file mode 100644
index de66879..0000000
--- a/pages/justTest/justTest.wxml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-pages/justTest/justTest.wxml
-进入直播
-进入直播详情页
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/justTest/justTest.wxss b/pages/justTest/justTest.wxss
deleted file mode 100644
index 3c29dd4..0000000
--- a/pages/justTest/justTest.wxss
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pages/justTest/justTest.wxss */
-page {
- background: #fff;
- text-align: center;
-}
-
-.box {
- padding: 30rpx 80rpx;
-}
-
-.img {
- width: 430rpx;
- height: 430rpx;
- margin: 20rpx 0;
-}
-button {
- width: 100%;
- background: #ffffff;
- border: none;
- border-radius: 0rpx;
- padding: 0;
- margin: 0;
-}
-
-.btn {
- background: green;
- color: #ffffff;
- border-radius: 0;
-}
\ No newline at end of file