addxx

app.json

@@ -29,7 +29,13 @@
     "pages/bankCard_list/bankCard_list",
     "pages/withdrawal_success/withdrawal_success",
     "pages/orderdetail/orderdetail",
-    "pages/payment_code/payment_code"
+    "pages/payment_code/payment_code",
+    "pages/check_logistics/check_logistics",
+    "pages/Ishop/Ishop",
+    "pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant",
+    "pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item",
+    "pages/Ishop/express/express",
+    "pages/wxStep/wxStep"
   ],
   "subpackages": [
     {

components/cremacteric/cremacteric.js

+// components/cremacteric/cremacteric.js
+const app = getApp();
+var clientImgPath = app.globalData.clientImgPath;
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        flag:false,
+        wrapAnimate:'wrapAnimate',
+        bgOpacity:0,
+        frameAnimate:'frameAnimate',
+        clientImgPath,
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        showFrame() {
+            this.setData({ flag: true, wrapAnimate: 'wrapAnimate', frameAnimate: 'frameAnimate' });
+          },
+          hideFrame() {
+            const that= this;
+            that.setData({ wrapAnimate: 'wrapAnimateOut', frameAnimate: 'frameAnimateOut' });
+            setTimeout(()=>{
+              that.setData({ flag: false})
+            },400)
+          }
+
+    }
+})

components/cremacteric/cremacteric.json

+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file

components/cremacteric/cremacteric.wxml

+<!--components/cremacteric/cremacteric.wxml-->
+<view wx:if='{{flag}}'>
+	<view class='wrap {{wrapAnimate}}' style='background:rgba(0,0,0,{{bgOpacity}});'></view>
+	<view catchtap='hideFrame' class='frame-wrapper {{frameAnimate}}'>
+		<view catchtap='catchNone' class='frame_1'>
+			<!-- 标题 -->
+			<view class='title-wrapper tect'>
+				<view class="btext">温馨提示</view>
+			</view>
+			<!-- 内容 -->
+			<!-- <slot></slot> -->
+			<view class="content">
+				为了后期统一渠道，现已关闭小程序、APP商家提现功能，以后商家提现请前往商家助手进行操作。
+			</view>
+			
+		</view>
+         <view class="close" catchtap='hideFrame'>
+	  <view class="tbimg">
+	  		<image src="{{clientImgPath}}/2020/index/group_img/close.png"></image>
+	  </view>
+	  </view>
+	</view>
+</view>

components/cremacteric/cremacteric.wxss

+/* components/cremacteric/cremacteric.wxss */
+/* 动画 */
+.wrapAnimate{
+    animation: wrapAnimate 0.1s ease-in-out forwards}
+  @keyframes wrapAnimate{
+    0%{}
+    100%{background:rgba(0,0,0,0.35);}
+  }
+  .wrapAnimateOut{animation: wrapAnimateOut 0.1s ease-in-out forwards}
+  @keyframes wrapAnimateOut{
+    0%{background:rgba(0,0,0,0.35);}
+    100%{background:rgba(0,0,0,0);}
+  }
+  .frameAnimate{animation: frameAnimate 0.2s ease forwards;}
+  @keyframes frameAnimate{
+    0%{}
+    100%{opacity: 1;top:0vh;}
+  }
+  .frameAnimateOut{animation: frameAnimateOut 0.2s ease forwards;}
+  @keyframes frameAnimateOut{
+    0%{opacity: 1;top:0vh;}
+    100%{opacity: 0;top:100vh;}
+  }
+
+
+
+/* 内容 */
+  .frame-wrapper{position: fixed;height:100vh;width:100vw;z-index: 999;top: 50vh;}
+  .frame_1{background: #fff;position: absolute;width:60vw;padding: 5.9vw 5.9vw 40rpx;border-radius:16rpx;z-index: 999;top: 35%;
+    left: 11%;
+    }
+  .title-wrapper{justify-content: space-between;font-size: 4.9vw;color: #4a4a4a;margin-bottom: 5.9vw;}
+  .title-wrapper>image{width:3.2vw;height:3.2vw;padding:0 5vw;margin-right:-5vw;}
+  .flex{display: flex;align-items: center;}
+  .wrap{position: fixed;z-index: 1;top: 0;left: 0;right: 0;bottom: 0;}
+  .tect{
+    text-align: center;
+  }
+  .btext{font-size:36rpx;
+    font-weight:800;
+    color:rgba(153,153,153,1);
+    border-bottom: 1px solid rgba(153,153,153,1);
+    padding: 0 0 20rpx 0;
+
+}
+    .btxia{
+       font-size:24rpx;
+       font-weight:500;
+       color:rgba(128,128,128,1);
+
+    }
+    .content{
+        text-align: center;
+        color:rgba(128,128,128,1);
+    }
+    
+
+
+
+    .close{
+   
+    
+        position: relative;
+       
+      
+      }
+
+
+      .tbimg{
+        position: absolute;
+        bottom: -280rpx;
+        width: 58rpx;
+        height: 58rpx;
+        top: 820rpx;
+        left: 320rpx;
+
+
+      }
\ No newline at end of file

components/login/login.js

@@ -30,6 +30,7 @@ Component({
       this.triggerEvent('setUserInfo',false);//传递方法
     },
     setUserInfo(e){
+        console.info("333");
         let that=this;
         wx.getSetting({ //小程序已经向用户请求过的权限
           success(res) {
@@ -106,6 +107,9 @@ Component({
                 }
               })
             }
+          },
+          fail:(e)=>{
+            console.info("抱错",e);
           }
         })
       

pages/Ishop/Ishop.js

+const app = getApp();
+import {
+    closing,
+    myStore,
+    closeshop
+} from '../../api/shop.js';
+
+var clientImgPath = app.globalData.clientImgPath;
+var img_host = app.globalData.ImgPath;
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        shop_id: '',
+        img_host: img_host,
+        clientImgPath: clientImgPath,
+        currentTab: 0,
+  
+    
+        is_ws: '',
+        money: 0.00,
+        money_day: 0.00,
+        money_yesterday: 0.00,
+        deposit: '0.00',
+        goldtwo: "0.00",
+    },
+    // 点击切换
+    clickTab: function (e) {
+        //debugger;
+        var that = this;
+        if (this.data.currentTab === e.target.dataset.current) {
+            return false;
+        } else {
+            that.setData({
+                currentTab: e.target.dataset.current,
+            })
+        }
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        var that = this;
+        that.initializedata();
+    },
+    // 跳转锁客佣金
+    commission: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/commission/commission',
+        })
+    },
+    // 跳转我的锁客
+    ILockguest: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/ILockguest/ILockguest',
+        })
+    },
+    // 跳转我的粉丝
+    Ifans: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/Ifans/Ifans',
+        })
+    },
+    // 跳转订单管理
+    weidianLine: function (e) {
+        console.log(app.globalData.shopType);
+        if (app.globalData.shopType == "ele") {
+            wx.navigateTo({
+                url: '/pages/personal/Ishop/delivery_orders_merchant/delivery_orders_merchant',
+            })
+        } else if (app.globalData.shopType == "weidian") {
+            wx.navigateTo({
+                url: '/pages/personal/Ishop/weidianLine_list_merchant/weidianLine_list_merchant',
+            })
+        } else if (app.globalData.shopType == "hotel") {
+            wx.navigateTo({
+                url: '/pages/personal/Ishop/hotel_order_merchant/hotel_order_merchant',
+            })
+        }
+    },
+    commentBack: function (e) {
+        var id = e.currentTarget.dataset.shopid;
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/comment_back/comment_back?shop_id=' + id,
+        })
+    },
+    // 跳转店铺账单
+    Ibill: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/Ibill/Ibill',
+        })
+    },
+    // 跳转店铺管理
+    shopManagement: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/shopManagement/shopManagement',
+        })
+    },
+    // 跳转商品管理
+    commodity: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/commodity_management/commodity_management',
+        })
+    },
+
+    // 跳转商家资金转出/提现
+    capital: function (e) {
+        let gold = e.currentTarget.dataset.gold;
+        wx.navigateTo({
+            url: '/pages/personal/withdraw/withdraw?type=2&gold=' + gold,
+        })
+    },
+    //跳转提现弹窗
+    cremacteric(){
+        this.selectComponent("#cremacteric").showFrame();
+       
+    },
+    // 跳转商家二维码
+    erweima: function (e) {
+        wx.navigateTo({
+            url: '/pages/personal/Ishop/erweima/erweima?shopname='+this.data.shop.shop_name,
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+    
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    // onShow: function () {
+    //     this.initializedata()
+    // },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+    is_switch: function (e) {
+        var is_open = e.target.dataset.current;
+        closing(is_open).then(res => {
+            if (res.code == 0) {
+                wx.showModal({
+                    title: '提示',
+                    content: res.msg,
+                })
+            }
+        })
+    },
+    // 跳转我的店铺
+    initializedata: function () {
+        var that = this;
+        var params = {};
+        myStore(params).then(res => {
+            let shopdata = res.data.shop;
+            if (res.code == 0) {
+                app.globalData.storeInfo = res.data.shop;
+                app.globalData.shopType = res.data.type;
+                console.log(res.data.shop.is_open);
+                if (res.data.shop.is_open == 1) {
+                    that.setData({
+                        currentTab: 0
+                    })
+                } else if (res.data.shop.is_open == 0) {
+                    that.setData({
+                        currentTab: 1
+                    })
+                }
+
+                let deposit = (res.data.deposit / 100).toFixed(2);
+                let gold = res.data.gold;
+                let goldtwo = 0;
+                if (shopdata.shoptype > 0 && parseFloat(shopdata.shopdeposit) > 0) {
+                    goldtwo = parseFloat(shopdata.shopdeposit);
+                } else {
+                    if ((parseFloat(gold) - parseFloat(deposit)) >= 0) {
+                        gold = parseFloat(gold) - parseFloat(deposit);
+                        gold = gold.toFixed(2);
+                        goldtwo = deposit;
+                    } else {
+                        // console.log(111)
+                        goldtwo = gold;
+                        gold = "0.00";
+                    }
+                }
+
+
+                that.setData({
+                    goldtwo: goldtwo,
+                    deposit: deposit, //保证金
+                    shop: res.data.shop,
+                    shop_id: res.data.shop.shop_id,
+                    counts: res.data.counts,
+                    gold: gold, //res.data.gold,//可提现金额
+                    is_ws: res.data.shop.is_ws,
+                    is_open: res.data.shop.is_open,
+                    cate_name: res.data.shop.cate_name,
+                    member: app.globalData.userInfo,
+                    type: res.data.type,
+                    replyDataCount: res.data.replyDataCount
+                })
+            } else if (res.code == -10800) {
+                wx.switchTab({
+                    url: "/pages/user/user",
+                })
+                return false;
+            } else {
+                wx.showModal({
+                    title: '提示',
+                    content: "您还未申请提交入驻资料，\n或商铺还在审核中！",
+                    showCancel: true,
+                    confirmText: '去开通',
+                    success: function (res) {
+                        if (res.confirm) {
+                            wx.redirectTo({
+                                url: '/pages/personal/Ishop/shopManagement/shopManagement_change/shopManagement_change',
+                            })
+                        } else if (res.cancel) {
+                            wx.navigateBack({
+                                delta: 1
+                            })
+                        }
+                    }
+                })
+            }
+        })
+    },
+
+    shopclose: function () {
+        wx.showModal({
+            title: '提示',
+            content: "您确定要关闭店铺吗？",
+            showCancel: true,
+            confirmText: '确定关闭',
+            success: function (res) {
+                if (res.confirm) {
+                    var that = this;
+                    var params = {};
+                    closeshop(params).then(res => {
+                   
+                        if (res.code == 0) {
+                            wx.showToast({
+                                title: '成功关闭',
+                                icon: 'success',
+                                duration: 2000,
+                                success:function(){
+                                    wx.switchTab({
+                                      url: '/pages/user/user',
+                                    })
+                                }
+                              })
+                         }
+                         else {
+                            wx.navigateBack({
+                                delta: 1
+                            })
+                        }
+                    })
+                } else if (res.cancel) {
+                    return false;
+                }
+            }
+        })
+    },
+    ////显示说明文本 说明可提现金额未扣除保证金后的金额
+    showmsgtx() {
+        //tooltiptextTwo
+        console.info("12");
+        //this.selectComponent("#prizemodel").showModal();
+        this.selectComponent("#tooltiptextTwo").showModal();
+    }
+});
\ No newline at end of file

pages/Ishop/Ishop.json

+{
+  "usingComponents": {
+    "cremacteric": "/components/cremacteric/cremacteric"
+  },
+  "navigationBarTitleText": "我的店铺",
+  "navigationBarBackgroundColor": "#FF5A03",
+  "navigationBarTextStyle": "white"
+}
\ No newline at end of file

pages/Ishop/Ishop.wxml

+<!--pages/Ishop/Ishop.wxml-->
+<view class="beijingimg"></view>
+<view class="boxs">
+  <view class="ali-c">
+    <view class="shpuimg">
+      <image src="{{img_host}}/attachs/{{shop.logo}}"></image>
+    </view>
+    <view class="flex1 ml-30">
+      <view class="zi_wmax sz_34 c_bi">{{shop.shop_name}}
+        <block wx:if="{{shop.shoptypename}}"> - {{shop.shoptypename}}</block>
+      </view>
+      <view class="ali-z mt-20">
+        <view class="sz_30 c_bi">
+          <view>所属类目：{{cate_name}}</view>
+          <view>所属状态：{{currentTab==0?'营业中':'打烊'}}</view>
+        </view>
+        <!-- <view wx:if="{{is_ws=='ele'}}" bindtap="is_switch" data-is_open="{{is_open}}" class="ali-c btnbox">
+					<view class="{{currentTab==0?'btnbox_zi':'btnbox_zis'}}" data-current="0" bindtap="clickTab">开业</view>
+					<view class="{{currentTab==1?'btnbox_zi':'btnbox_zis'}}" data-current="1" bindtap="clickTab">打烊</view>
+				</view> -->
+      </view>
+    </view>
+  </view>
+
+  <!-- <view class="topbox_20 mt-50">
+    <view class="ali-z">
+      <view class="mt-30 mb-30 te_ct">
+        <view class="sz_32 bt_hei">总收入</view>
+        <view class="sz_32 sz_rd mt-20">{{counts.money}}</view>
+      </view>
+      <view class="mt-30 mb-30 te_ct">
+        <view class="sz_32 bt_hei">今日收入</view>
+        <view class="sz_32 sz_qi mt-20">{{counts.money_day}}</view>
+      </view>
+      <view class="mt-30 mb-30 te_ct">
+        <view class="sz_32 bt_hei">昨日收入</view>
+        <view class="sz_32 c_ff mt-20">{{counts.money_yesterday}}</view>
+      </view>
+      <view class="mt-30 mb-30 te_ct" wx:if="{{goldtwo>0}}">
+        <view class="sz_32 bt_hei">保证金</view>
+        <view class="sz_32 c_ff mt-20">{{goldtwo}}</view>
+      </view>
+    </view>
+  </view> -->
+
+  <!-- <view class="topbox_20 mt-20">
+		<view class="ali-z mt-10 mb-10">
+			<view class="sz_30 bt_hei">
+				<view class="mb-10 ali-c" bindtap="showmsgtx">可提现 <image class="msgsiocns" src="{{clientImgPath}}/images/uts/msgsicons.png"></image>
+				</view>
+				<view class="balanceiocn">{{gold}}</view>
+			</view>
+			<view class="ali-c sz_30 c_bi" data-gold="{{gold}}" bindtap="cremacteric"   >
+				<view class="btn1 mr-10">提现</view>
+			</view>
+		</view>
+	</view> -->
+  <!-- 提现弹窗 -->
+
+  <cremacteric id="cremacteric" />
+
+  <!-- <view class="topbox_20 mt-20">
+		<view class="sz_32 bt_heibl mt-10">商家管理</view>
+		<view class="ali-z mt-40 mb-10">
+			<view class="te_ct" bindtap="shopManagement">
+				<view class="guliimg ov">
+					<image src="{{clientImgPath}}/images/uts/store_management@2x.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">店铺管理</view>
+				<view class="sz_26 xi_hui">店铺基本信息、卡券设置</view>
+			</view>
+			<view class="shuxian"></view>
+			<view class="te_ct" bindtap="commodity">
+				<view class="guliimg ov">
+					<image src="{{clientImgPath}}/images/uts/commodity_management@2x.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20" wx:if="{{type=='hotel'}}">酒店管理</view>
+				<view class="sz_30 bt_hei mt-20" wx:else>商品管理</view>
+				<view class="sz_26 xi_hui" wx:if="{{type=='hotel'}}">房间添加、删除、上下架</view>
+				<view class="sz_26 xi_hui" wx:else>房间添加、删除、上下架</view>
+			</view>
+		</view>
+	</view> -->
+
+  <view class="topbox_20 mt-20">
+    <view class="sz_32 bt_heibl mt-10">商家中心</view>
+    <view class="mt-40 ali-c ds-fw">
+      <navigator url='/pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant' class="te_ct mb-40"  data-type="" style="width:25%">
+        <view class="zoxiimg ov">
+          <image src="{{clientImgPath}}/images/uts/diangdanguanli.png"></image>
+        </view>
+        <view class="sz_30 bt_hei mt-20">订单管理</view>
+      </navigator>
+
+      <!-- <view class="te_ct mb-40" bindtap="Ifans" style="width:25%">
+				<view class="zoxiimga ov">
+					<image src="{{clientImgPath}}/images/uts/fensi.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">我的粉丝</view>
+			</view>
+			<view class="te_ct mb-40" bindtap="erweima" style="width:25%">
+				<view class="zoxiimgb ov">
+					<image src="{{clientImgPath}}/images/uts/erweima.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">我的二维码</view>
+			</view>
+			<view class="te_ct mb-40" bindtap="Ibill" style="width:25%">
+				<view class="zoxiimg ov">
+					<image src="{{clientImgPath}}/images/uts/zhangdan.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">我的账单</view>
+			</view>
+			<view class="te_ct mb-20" bindtap="ILockguest" style="width:25%">
+				<view class="zoxiimga ov">
+					<image src="{{clientImgPath}}/images/uts/suoke.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">我的锁客</view>
+			</view>
+			<view class="te_ct mb-20" bindtap="commission" style="width:25%">
+				<view class="zoxiimga ov">
+					<image src="{{clientImgPath}}/images/uts/shouyi.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">锁客收益</view>
+			</view>
+			<view wx:if="{{type!='hotel'}}" class="te_ct mb-20" bindtap="commentBack" data-shopId="{{shop.shop_id}}" style="width:25%">
+				<view class="zoxiimga po_r">
+					<image src="{{clientImgPath}}/images/uts/dianpupl.png"></image>
+					<block wx:if="{{replyDataCount>0}}">
+						<view class="po_a gel_shu">{{replyDataCount}}</view>
+					</block>
+					<block wx:else>
+					</block>
+				</view>
+				<view class="sz_30 bt_hei mt-20">店铺评论</view>
+			</view>
+
+			<navigator url="/pages/LuckDraw/homenav/homenav" class="te_ct mb-20" style="width:25%">
+				<view class="zoxiimga zoxiimgaluc ov">
+					<image src="{{clientImgPath}}/images/luckdraw/userluckicons.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">抽奖活动</view>
+			</navigator>
+			<view class="te_ct mb-20" style="width:25%" bindtap="shopclose" >
+				<view class="zoxiimga zoxiimgaluc ov">
+					<image src="{{clientImgPath}}/images/uts/shopdown.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">我要关店</view>
+			</view>
+
+			<navigator url="/pages/personal/Ishop/shareActivity/shareActivity?shop_id={{shop_id}}" class="te_ct mb-20" style="width:25%">
+				<view class="zoxiimga zoxiimgaluc ov">
+					<image src="{{clientImgPath}}/images/zeroActivity/shopzero.png"></image>
+				</view>
+				<view class="sz_30 bt_hei mt-20">0元领活动</view>
+			</navigator> -->
+
+    </view>
+  </view>
+</view>
\ No newline at end of file

pages/Ishop/Ishop.wxss

+/* pages/personal//Ishop/Ishop.wxss */
+page{
+  position: relative;
+  background: rgba(245, 242, 242, 1);
+  }
+  .shpuimg{
+  width:116rpx;
+  height:116rpx;
+  border-radius:5rpx;
+  overflow: hidden; 
+  }
+  .btnbox{
+  border:1px solid rgba(255,255,255,1);
+  border-radius:5rpx;
+  }
+  .btnbox_zi{
+  width:130rpx;
+  height:67rpx;
+  line-height:67rpx;
+  text-align: center;color: #f64f15;
+  background: #fff;
+  }
+  .btnbox_zis{
+  width:130rpx;
+  height:67rpx;
+  line-height:67rpx;
+  text-align: center;color: #fff;
+  }
+  .btn1{
+  width:150rpx;
+  height:80rpx;
+  background:rgba(255,77,21,1);
+  border-radius:5rpx;
+  text-align: center;line-height: 80rpx}
+  .btn2{
+  width:150rpx;
+  height:80rpx;
+  border-radius:5rpx;
+  background:rgba(255,105,0,1);
+  text-align: center;line-height: 80rpx
+  }
+  .guliimg{
+  width: 96rpx;
+  height: 96rpx;
+  margin: 0 auto
+  }
+  .shuxian{
+    width:1px;
+  height:120rpx;
+  background:rgba(223,223,223,1);
+  }
+  .zoxiimg{
+  width: 55rpx;
+  height: 64rpx;
+  margin: 0 auto
+  }
+  .zoxiimga{
+  width: 60rpx;
+  height: 55rpx;
+  margin: 0 auto
+  }
+  .zoxiimgaluc{
+    width: 60rpx;
+  height: 60rpx;
+  }
+  .zoxiimgb{
+  width: 60rpx;
+  height: 60rpx;
+  margin: 0 auto
+  }
+  
+  .msgsiocns{
+    width: 30rpx;
+    height: 30rpx;
+    margin-left: 20rpx;
+  
+  }
+  
+  .balanceiocn{
+    font-family:PingFang SC;
+    font-weight:bold;
+    font-size: 40rpx;
+  }
+  
\ No newline at end of file

pages/Ishop/express/express.js

+const app = getApp()
+import { logisticsList, oneKeyShipments  } from '../../../api/shop.js';
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    clientImgPath: app.globalData.clientImgPath,
+    selectData: [],
+    index:-1
+  },
+  bindPickerChange: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    var index = e.detail.value
+    this.setData({
+      index: e.detail.value
+    })
+    console.log(index)
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    var that=this;
+    that.setData({
+      order_id: options.order_id,
+      vendor_id:options.vendor_id
+      
+    })
+    that.initializedata();
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  //初始化数据
+  initializedata: function () {
+    var that=this;
+    let params = {};
+    logisticsList(params).then(res => {
+        that.setData({
+          selectData: res.data,
+        })
+    })
+  },
+  formSubmit:function(e){
+    var that=this;
+    console.log(that.data.vendor_id);
+    let params = {
+      order_id: that.data.order_id,
+      shipperName: that.data.selectData[that.data.index],
+      logisticCode: e.detail.value.logisticCode,
+      formId:e.detail.formId,
+      vendor_id:that.data.vendor_id
+
+    };
+    oneKeyShipments(params).then(res => {
+      if (res.code == 0) {
+        wx.showModal({
+          title: '提示',
+          content: res.msg,
+          showCancel: false,
+          success(res) {
+            wx.redirectTo({
+              url: '/pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant'
+            })
+          }
+        })
+      }else {
+        app.showModal({
+          content: res.msg,
+          showCancel: false,
+        });
+      }
+    })
+  },
+  cancelShipments:function(){
+    wx.redirectTo({
+      url: '/pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant'
+    })
+  }
+})
\ No newline at end of file

pages/Ishop/express/express.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "快递发货"
+}
\ No newline at end of file

pages/Ishop/express/express.wxml

+<view class="boxs">
+<form bindsubmit="formSubmit" report-submit="true">
+      <view class="topbox_20">
+      <picker bindchange="bindPickerChange" value="{{index}}" range="{{selectData}}">
+         <view class="ali-z mt-10">
+              <view class="ali-c">
+                  <view class="kuaiimg mr-40"><image src="{{clientImgPath}}/images/uts/kuaidi.png"></image></view>
+                  <view wx:if='{{index==-1}}' class="sz_30 bt_hei">请选择快递公司</view>
+                  <view wx:if='{{index>=0}}' class="sz_30 bt_hei">{{selectData[index]}}</view>
+              </view>
+              <view class="xiangyouimg"><image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image></view>
+         </view>
+      </picker>
+         <view class="xian mt-30 mb-30"></view>
+         <view class="ali-c">
+              <view class="didanimg mr-50"><image src="{{clientImgPath}}/images/uts/dingdanhao.png"></image></view>
+              <view class="inptqt"><input name='logisticCode' placeholder="请填写快递单号" placeholder-class="sz_30 inp_hui"></input></view>
+         </view>
+         <view class="xian mt-30 mb-30"></view>
+         <view class="ali-z mt-80">
+                <button class="button_b" bindtap="cancelShipments" style="width:45%">取消</button>
+                <button class="button " form-type="submit" style="width:45%">确定发货</button>
+         </view>
+      </view>
+</form>
+</view>

pages/Ishop/express/express.wxss

+/* pages/Ishop/express/express.wxss */
+/* pages/personal//express/express.wxss */
+page{
+  background: rgba(245, 242, 242, 1);
+}
+.kuaiimg{
+width: 48rpx;
+height: 38rpx;
+}
+.xiangyouimg{
+width:10rpx;
+height:18rpx;
+}
+.inptqt{
+  flex: 1;
+  height: 40rpx
+}
+.didanimg{
+  width: 40rpx;
+  height: 42rpx;
+}
\ No newline at end of file

pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.js

+//商家商城订单详情
+const app = getApp();
+var clientImgPath = app.globalData.clientImgPath;
+var img_host = app.globalData.ImgPath;
+import {
+  orderStatus,
+  orderGoodsList,
+  requestOrder
+} from '../../../api/shop.js';
+import Utils from "../../../utils/util.js";
+import luma from '../../../utils/luma.js';
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    img_host: app.globalData.ImgPath,
+    currentTab: 0,
+    order: [],
+    pageNum: 1,
+    is_loading_done: false,
+    statusTab: '1',
+    clientImgPath: clientImgPath
+  },
+  //点击切换
+  clickTab: function (e) {
+    //debugger;
+    var that = this;
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current,
+      })
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      statusTab: options.current ? options.current : "1", // 订单状态
+      status: options.status ? options.status : "1",
+      is_dianping: options.is_dianping ? options.is_dianping : 0,
+    })
+    let params = {};
+    orderStatus(params).then(res => {
+      if (res.code == 0) {
+        let order_status_list = Utils.checkArray(res.data) ? res.data : [];
+        that.setData({
+          order_status_list: order_status_list,
+        })
+      }
+    })
+    that.initializedata();
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this;
+    var pageNum = that.data.pageNum;
+    that.setData({
+      pageNum: 1,
+      order: [],
+      is_loading_done: false
+    })
+    wx.showToast({
+      title: '正在刷新',
+      icon: 'loading',
+      mask: true
+    })
+    that.initializedata();
+    wx.stopPullDownRefresh();
+  },
+  loadmore: function () {
+    var that = this;
+    var pageNum = parseInt(that.data.pageNum) + 1;
+    that.setData({
+      pageNum: pageNum
+    })
+    that.initializedata()
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function (e) {
+    var that = this;
+    var is_loading_done = that.data.is_loading_done; //是否加载完毕
+    if (is_loading_done == false) { //还没加载完毕则继续加载
+      wx.showLoading({
+        title: '加载中',
+        mask: false
+      })
+      that.loadmore();
+    } else {
+      wx.showLoading({
+        title: '已全部加载完毕',
+        mask: false
+      })
+      setTimeout(function () {
+        wx.hideLoading()
+      }, 1000)
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  /**
+   * 顶部导航选中
+   */
+  selectOrderStatus: function (event) {
+    let that = this;
+    let statusTab = event.currentTarget.dataset.statustab;
+    let status = event.currentTarget.dataset.status;
+    let is_dianping = event.currentTarget.dataset.is_dianping;
+    let sale_status = event.currentTarget.dataset.sale_status;
+    that.setData({
+      order: [],
+      statusTab: statusTab,
+      status: status,
+      is_dianping: is_dianping,
+      sale_status: sale_status,
+      is_loading_done: false,
+      currentTab: event.target.dataset.current,
+      pageNum: 1,
+    })
+    that.initializedata();
+  },
+  /**
+   * 初始化数据
+   */
+  initializedata: function () {
+    var that = this;
+    let params = {
+      status: that.data.status,
+      is_dianping: that.data.is_dianping,
+      sale_status: that.data.sale_status,
+      page: parseInt(that.data.pageNum) ? parseInt(that.data.pageNum) : (0 + 1),
+    };
+    orderGoodsList(params).then(res => {
+      console.log(res);
+      if (res.data == null || res.data.length == 0) {
+        that.setData({
+          is_loading_done: true,
+        })
+      } else {
+        var my_order = that.data.order;
+        my_order = my_order.concat(res.data);
+        that.setData({
+          order: my_order,
+        })
+      }
+      wx.hideLoading();
+    })
+  },
+  /**
+   * 订单操作
+   */
+  operation: function (event) {
+    console.log(event)
+    let that = this;
+    let action = event.currentTarget.dataset.action;
+    let order_id = event.currentTarget.dataset.orderid;
+    let vendor_id = event.currentTarget.dataset.vendor_id;
+    console.log(vendor_id)
+    switch (action) {
+      case 'oneKeyCancel': //一键核销
+        that.oneShowModal(order_id, action, "是否一键核销", "核销成功资金将立即到账");
+        break;
+      case 'oneKeyShipments': //一键发货
+        that.express(order_id, action,vendor_id);
+        break;
+      case 'checkLogistics': //查看物流
+        that.logistics(order_id, action,vendor_id);
+        break;
+      case 'orderDetails': //订单详情
+        that.orderDetails(order_id);
+        break;
+      case 'consentRefund': //同意退款
+        that.oneShowModal(order_id, action, "是否同意退款", "订单资金将会原路退回，结束此订单");
+        break;
+      case 'refuseRefund': //拒绝退款
+        that.oneShowModal(order_id, action, "是否拒绝退款", "若拒绝退款，该订单将按正常下单流程继续进行");
+        break;
+      default:
+        that.requestOrder(order_id, action);
+        break;
+    }
+  },
+  //查看物流
+  logistics: function (order_id, action,vendor_id) {
+    wx.navigateTo({
+      url: '/pages/shop/order/weidianorder/check_logistics/check_logistics?order_id=' + order_id + '&action=' + action+ '&vendor_id=' + vendor_id
+    })
+  },
+  //跳转订单详情
+  orderDetails: function (order_id) {
+    wx.navigateTo({
+      url: '/pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item?order_id=' + order_id,
+    })
+  },
+  // 跳转发快递订单
+  express: function (order_id, action,vendor_id) {
+    wx.navigateTo({
+      url: '/pages/Ishop/express/express?order_id=' + order_id + '&action=' + action+ '&vendor_id=' + vendor_id
+    })
+  },
+  oneShowModal: function (order_id, action, title, content) {
+    var that = this;
+    wx.showModal({
+      title: title ? title : '提示',
+      content: content,
+      success: function (res) {
+        if (res.confirm) {
+          that.requestOrder(order_id, action);
+        }
+      }
+    })
+  },
+  //请求后台操作订单
+  requestOrder: function (order_id, action) {
+    var that = this;
+    let params = {
+      order_id: order_id,
+      action: action,
+    };
+    requestOrder(params).then(res => {
+      if (res.code == 0) {
+        wx.showModal({
+          title: '提示',
+          content: res.msg,
+          showCancel: false,
+          success(res) {
+            wx.redirectTo({
+              url: '/pages/personal/Ishop/weidianLine_list_merchant/weidianLine_list_merchant?status=' + that.data.status + "&current=" + that.data.statusTab,
+            })
+          }
+        })
+      } else {
+        app.showToast({
+          title: res.msg,
+        });
+      }
+    })
+  },
+  jumpDd(e) {
+    let shop_id = e.currentTarget.dataset.shop_id;
+    luma.bindclassifyUrl(shop_id);
+  },
+})
\ No newline at end of file

pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "订单管理"
+}
\ No newline at end of file

pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.wxml

+<view class="xian"></view>
+<view class="tapbox-24 ali-z omnirange">
+	<block wx:for='{{order_status_list}}' wx:key='' wx:for-item="item">
+		<view class="topzi {{statusTab == item.status_id  ?'topzis':''}}" data-current="1" data-statusTab="{{item.status_id}}" data-status="{{item.status}}" data-is_dianping="{{item.is_dianping}}" data-sale_status="{{item.sale_status}}" catchtap='selectOrderStatus'>{{item.status_name}}</view>
+	</block>
+</view>
+<view class="boxs">
+
+	<!-- 没有订单显示 -->
+	<view class="te_ct meybox" wx:if='{{!order}}'>
+		<view class="meyimg">
+			<image src="{{clientImgPath}}/images/wm/meiyou.png"></image>
+		</view>
+		<view class="sz_42 inp_hui mt-30">您还没有订单记录</view>
+	</view>
+	<!-- s -->
+	<block wx:for='{{order}}' wx:key='index' wx:for-item="item">
+		<view class="topbox_20 mb-20">
+			<view class="ali-z">
+				<view class="ali-c flex1" data-shop_id="{{item.shop_id}}" bindtap="jumpDd">
+					<view class="tubiimg mr-20">
+						<image src="{{clientImgPath}}/images/yx/dianpu@2x.png"></image>
+					</view>
+					<view class="bt_min flex1 oneline">{{item.shop_name}}</view>
+				</view>
+
+				<view class="sz_30 c_ff ml-20">{{item.order_status}}</view>
+			</view>
+			<view class="cretime mt-10">
+					下单时间：{{item.create_time}}
+			</view>
+
+			<view class="mt-30" wx:for='{{item.products}}' wx:for-item="orderG" data-orderid='{{item.order_id}}' wx:for-index="vendorid"  catchtap="operation" wx:key="index" data-action='orderDetails' >
+				<view wx:for='{{orderG.orderGoods}}' wx:for-item="product" class="flex" style="margin:0 0 20rpx 0;">
+					<view class="tuimg br_10 ov">
+						<image src='{{img_host}}/attachs/{{product.photo}}' wx:if="{{product.photo}}"></image>
+						<image src='{{img_host}}/attachs/{{item.photo}}' wx:else></image>
+					</view>
+					<view class="flex1 ml-25">
+						<view style="height:70rpx">
+									<view class="sz_30 bt_hei twoline btli" >{{product.goods_name}}</view>
+						</view>
+					
+						<view class="sz_26 bt_hei mt-10">直购价{{product.fprice}}元 <text class="ml-20"wx:if="{{item.buytype==0 && product.recprice >0}}">充值免费价{{product.recprice}}元</text> </view>
+						<view class="sz_26 inp_hui mt-10">{{product.sku_name||''}}</view>
+						<view class="sz_26 inp_hui mt-10">数量: x {{product.goodsnum}}</view>
+					</view>
+				</view>
+				<block wx:for='{{orderG.operation}}' wx:for-item="action">
+					<view class='sz_28 ml-20 box {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}' data-vendor_id="{{vendorid}}"  >{{action.name}}</view>
+				</block>
+			</view>
+			<view class="xian mt-30 mb-30"></view>
+			<view class="ali-z sz_30 bt_hei" bindtap="eleLine">
+				<view></view>
+				<view class="ml-20 sz_32 bt_hei">合计:￥{{item.total}}</view>
+			</view>
+			<view class="xian mt-30 mb-30"></view>
+			<view class="ali-e">
+				<view class="ali-c">
+					<block wx:for='{{item.order_operation}}' wx:for-item="action" wx:key="index">
+						<view class='sz_28 ml-20 {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}'>{{action.name}}</view>
+					</block>
+
+				</view>
+			</view>
+		</view>
+	</block>
+</view>
\ No newline at end of file

pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.wxss

+page {
+  background: rgba(245, 242, 242, 1);
+  padding-top: 80rpx;
+  box-sizing: border-box;
+}
+
+.spimg {
+  width: 70rpx;
+  height: 70rpx;
+  border-radius: 5rpx;
+}
+
+.btnhui {
+  padding: 10rpx 20rpx;
+  box-sizing: border-box;
+  border: 1px solid rgba(204, 204, 204, 1);
+  border-radius: 5rpx;
+}
+
+.tukjimg {
+  width: 100rpx;
+  height: 100rpx;
+}
+
+.btnhong {
+  padding: 12rpx 30rpx;
+  box-sizing: border-box;
+  background: #f64f15;
+  border-radius: 5rpx;
+}
+
+.meyimg {
+  width: 460rpx;
+  height: 360rpx;
+  margin: 0 auto;
+}
+
+.meybox {
+  margin-top: 200rpx;
+}
+
+.tubiimg {
+  width: 27rpx;
+  height: 24rpx;
+}
+
+.tuimg {
+  width: 183rpx;
+  height: 183rpx;
+}
+
+.btli {
+  line-height: 112%;
+  letter-spacing: 3rpx
+}
+
+.wullu {
+  text-align: center;
+
+  width: 180rpx;
+  margin-left: 70%;
+  display: inline-block;
+
+
+}
+
+.omnirange {
+  position: fixed;
+  top: 0;
+
+}
+
+.boxid {
+
+  margin-top: 80rpx;
+
+}
+
+.box {
+  display: flex;
+  justify-content: center;
+  width: 170rpx;
+  margin-left: 72%;
+}
+
+.cretime {
+  color: #888888;
+  font-size: 26rpx;
+  font-weight: 500;
+  margin-bottom: 20upx;
+}
\ No newline at end of file

pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.js

+const app = getApp()
+import {
+  orderDetail,
+  requestOrder
+} from '../../../api/order.js';
+import luma from '../../../utils/luma.js';
+var timer = '';
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    img_host: app.globalData.ImgPath,
+    clientImgPath: app.globalData.clientImgPath,
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      order_id: options.order_id
+    })
+    that.initializedata();
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  initializedata: function () {
+    var that = this;
+    let params = {
+      order_id: that.data.order_id,
+    };
+    orderDetail(params).then(res => {
+      console.log(res);
+      if (res.code < 0) {
+        app.showToast({
+          title: res.msg
+        });
+      } else {
+        that.setData({
+          detail: res.data.detail,
+          logs: res.data.logs,
+          CONFIG: app.globalData.CONFIG
+        })
+      }
+    })
+  },
+  callTel: function (e) {
+    wx.makePhoneCall({
+      phoneNumber: e.currentTarget.dataset.tel // 仅为示例，并非真实的电话号码
+    })
+  },
+  delorder: function (e) {
+    var that = this;
+    let params = {
+      order_id: e.currentTarget.dataset.order_id,
+      action: "delorder",
+    };
+    requestOrder(params).then(res => {
+      if (res.code == 0) {
+        that.toggleDialog();
+        wx.redirectTo({
+          url: '/pages/shop/order/weidianorder/weidianLine_list_user/weidianLine_list_user'
+        })
+      }
+    })
+  },
+  jumpDd(e) {
+    let shop_id = e.currentTarget.dataset.shop_id;
+    luma.bindclassifyUrl(shop_id);
+  },
+})
\ No newline at end of file

pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.json

+{
+  "usingComponents": {
+
+  },
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#FF5A03",
+  "navigationBarTextStyle": "white"
+}
\ No newline at end of file

pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.wxml

+<view class="beijingimg" style="height:160rpx"></view>
+<view class="boxs">
+	<view class="topbox_20 mt-60" wx:if="{{detail.delivery_type>=1}}">
+		<view class="ali-c">
+			<view class="weizhiimg">
+				<image src="{{clientImgPath}}/images/sc/dizhi@2x.png"></image>
+			</view>
+			<view class="flex1 ml-20">
+				<view class="sz_30 bt_hei">{{detail.addr.name}} {{detail.addr.mobile}}</view>
+				<view class="sz_30 bt_hei mt-10">{{detail.addr.addr}}</view>
+			</view>
+		</view>
+	</view>
+	<view class="topbox_20 mt-60" wx:else>
+		<view class="ali-c">
+			<view class="weizhiimg">
+				<image src="{{clientImgPath}}/images/sc/dizhi@2x.png"></image>
+			</view>
+			<view class="flex1 ml-20">
+				<view class="sz_30 bt_hei">到店支付</view>
+			</view>
+		</view>
+	</view>
+	<view class="topbox_20 mt-20">
+		<view class="ali-c">
+			<view class="tubiimg mr-20">
+				<image src="{{clientImgPath}}/images/yx/dianpu@2x.png"></image>
+			</view>
+			<view class="bt_min flex1" data-shop_id="{{detail.shop_id}}" bindtap="jumpDd">{{detail.shop_name}}</view>
+		</view>
+		<view class="flex mt-30" wx:for='{{detail.products}}' wx:key='index' wx:for-item="item">
+			<view class="tuimg br_10 ov">
+				<image src='{{img_host}}/attachs/{{item.photo}}' wx:if="{{item.photo}}"></image>
+				<image src='{{img_host}}/attachs/{{detail.photo}}' wx:else></image>
+			</view>
+			<view class="flex1 ml-25">
+				<view class="sz_30 bt_hei twoline" style="height:65rpx">{{item.goods_name}}</view>
+				<view class="sz_26 bt_hei mt-10">直购价{{item.fprice}}元
+					<text class="ml-20" wx:if="{{detail.buytype==0 && item.recprice >0}}">充值免费价{{item.recprice}}元</text> </view>
+				<!-- <view class="sz_26 inp_hui mt-10">型号:大罐<text class="ml-20">包装:2袋装</text>
+        </view> -->
+				<view class="sz_26 inp_hui mt-10"> {{item.sku_name||''}}</view>
+				<view class="sz_26 inp_hui mt-10">数量: x {{item.goodsnum}}</view>
+			</view>
+		</view>
+	</view>
+	<!-- 优惠劵显示 -->
+    <view class="topbox_20 mt-20">
+		<view class="ali-z sz_30 bt_hei">
+			<view>满减优惠</view>
+			<view style="color:#f64f15">¥{{detail.cprice}}</view>
+		</view>
+	</view>
+
+	<view class="topbox_20 mt-20">
+		<view class="ali-z sz_30 bt_hei">
+			<view>总计</view>
+			<view>¥{{detail.amount}}</view>
+		</view>
+	</view>
+
+	<view class="topbox_20 mt-20" wx:if='{{logs}}'>
+		<view class="ali-z">
+			<view class="sz_30 bt_hei twb">订单信息</view>
+		</view>
+		<view class="xian mt-30 mb-30"></view>
+		<view class="ali-z">
+			<view class="sz_30 bt_hei">订单编号</view>
+			<view class="sz_30 bt_hei">{{logs.order_sn}}</view>
+		</view>
+		<view class="xian mt-30 mb-30"></view>
+		<view class="ali-z">
+			<view class="sz_30 bt_hei">创建时间</view>
+			<view class="sz_30 bt_hei">{{logs.createtime}}</view>
+		</view>
+	</view>
+	<view class="xian mt-30 mb-30"></view>
+	<view class="ali-e">
+		<view class="ali-c">
+			<block wx:for='{{item.order_operation}}' wx:for-item="action">
+				<view class='sz_28 ml-20 {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}'>{{action.name}}</view>
+			</block>
+		</view>
+	</view>
+	<view class="bc_bi br_15 ali-c mt-20" style="width:100%">
+		<view class="flexc" style="width:50%;height:100rpx" bindtap='callTel' data-tel='{{detail.addr.mobile}}'>
+			<view class="dianhuimg">
+				<image src="{{clientImgPath}}/images/sc/dianhua@2x.png"></image>
+			</view>
+			<view class="sz_30 bt_hei ml-20">联系客户</view>
+		</view>
+		<view class="shuxian"></view>
+		<view class="flexc" style="width:50%;height:100rpx">
+			<view class="dianhuimg">
+				<image src="{{clientImgPath}}/images/sc/xinxi.png"></image>
+			</view>
+			<view class="sz_30 bt_hei ml-20" bindtap='callTel' data-tel='{{CONFIG.site.tel?CONFIG.site.tel:"13970923557"}}'>联系平台</view>
+		</view>
+	</view>
+	<!-- 猜你会买 -->
+</view>
\ No newline at end of file

pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.wxss

+/* pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.wxss */
+/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
+page{
+  position: relative;
+  padding-bottom: 100rpx;
+  background: #F5F5F5;
+}
+.weizhiimg{
+width: 30rpx;
+height: 46rpx;
+}
+.shuwuimg{
+width:67rpx;
+height:67rpx;
+border-radius:4rpx;
+overflow: hidden;
+}
+.btbox{
+width:190rpx;
+height:77rpx;
+background:rgba(255,255,255,1);
+border-radius:4rpx;
+}
+.xiangyouimg{
+width:14rpx;
+height:24rpx;
+}
+.dianhuimg{
+width:42rpx;
+height:42rpx;
+}
+.kuai{
+width:40rpx;
+height:40rpx;
+text-align: center;
+line-height: 40rpx;
+font-size:24rpx;
+font-weight:500;
+color:rgba(255,255,255,1);
+}
+
+.dibu_qr{
+  position: fixed;
+  bottom: 0;
+  width:100%;
+background:rgba(255,255,255,1);
+padding: 10rpx 24rpx;
+box-sizing: border-box;
+}
+.beizhu{
+width: 150rpx;
+text-align: right;
+}
+.tubiimg{
+width:27rpx;
+height:24rpx;
+}
+.tuimg{
+width:183rpx;
+height:183rpx;
+}
+view{
+  line-height: 112%;
+  letter-spacing:3rpx
+}
+.dianhuimg{
+width:43rpx;
+height:43rpx;
+}
+.shuxian{
+width:1px;
+height:100rpx;
+background:rgba(242,242,242,1);
+}
+.duanxian{
+width:45rpx;
+height:1px;
+background: rgba(181,181,181,1);
+}
+.cptjimg{
+width:100%;
+height:310rpx;
+}
+/* 取消弹窗 */
+.zan-dialog__mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 10;
+ background: rgba(0, 0, 0, .5);
+ display: none;
+}
+ 
+.zan-dialog__container {
+ position: fixed;
+ bottom: 400rpx;
+ width: 650rpx;
+ height: 350rpx;
+ margin-left: 50rpx;
+ background: #f8f8f8;
+ transform: translateY(300%);
+ transition: all 0.4s ease;
+ z-index: 12;
+ border-radius: 20rpx;
+ /* box-shadow: 0px 3px 3px 2px gainsboro; */
+}
+ 
+.zan-dialog--show .zan-dialog__container {
+ transform: translateY(0);
+}
+ 
+.zan-dialog--show .zan-dialog__mask {
+ display: block;
+}
\ No newline at end of file

pages/aboutus/acertificates/acertificates.wxml

@@ -3,13 +3,7 @@
 </view>
 <view class='top-img-text'>增值电信业务经营许可证</view>
 
-<view class='top-img'>
-   <image src='{{img_host}}/static/default/images/108zhuzuo.jpg'></image>
-</view>
-<view class='top-img'>
-   <image src='{{img_host}}/static/default/images/108zhuzuo2.jpg'></image>
-</view>
-<view class='top-img-text'>计算机软件著作权登记证书</view>
+
 
 <view class='top-imgs'>
    <image src='{{img_host}}/static/default/images/gaoxin.jpg'></image>

pages/check_logistics/check_logistics.js

+const app = getApp()
+import {requestOrder} from '../../api/order.js';
+import Utils from "../../utils/util.js";
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+      clientImgPath: app.globalData.clientImgPath,
+      list:[],
+      shipperName:'',
+      logisticCode:'',
+      logisticLogo:'',
+      phone:'',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    console.log(options);
+    let params = {
+      order_id: options.order_id,
+      action: options.action,
+      vendor_id:options.vendor_id
+      
+    };
+    requestOrder(params).then(res => {
+      console.log(res);
+      if (res.code == 0) {
+        let data = res.data;
+        let list = Utils.checkArray(data.Traces) ? data.Traces : [];
+        let logistics_info = that.getLogisticsConfig(data.ShipperCode)
+        that.setData({
+          list: list.reverse(),
+          logisticCode: data.LogisticCode,
+          shipperName: logistics_info.name,
+          logisticLogo: logistics_info.img_url,
+          phone: logistics_info.phone
+        })
+      }
+    })
+  },
+  /**
+  * 获取快递公司信息
+  */
+  getLogisticsConfig: function (shipperCode) {
+    let config = {
+      'YTO': { 'name': '圆通速递', 'phone': '95554', 'img_url': '/images/delivery_icon/YTO.png' },
+      'HTKY': { 'name': '百世快递', 'phone': '95320', 'img_url': '/images/delivery_icon/HTKY.png' },
+      'ZTO': { 'name': '中通快递', 'phone': '95311', 'img_url': '/images/delivery_icon/ZTO.png' },
+      'STO': { 'name': '申通快递', 'phone': '95543', 'img_url': '/images/delivery_icon/STO.png' },
+      'SF': { 'name': '顺丰速运', 'phone': '95338', 'img_url': '/images/delivery_icon/SF.png' },
+      'YD': { 'name': '韵达速递', 'phone': '95546', 'img_url': '/images/delivery_icon/YD.png' },
+      'YZPY': { 'name': '邮政快递包裹', 'phone': '11185', 'img_url': '/images/delivery_icon/EMS.png' },
+      'EMS': { 'name': 'EMS', 'phone': '11183', 'img_url': '/images/delivery_icon/EMS.png' },
+      'HHTT': { 'name': '天天快递', 'phone': '400-188-8888', 'img_url': '/images/delivery_icon/HHTT.png' },
+      'JD': { 'name': '京东快递', 'phone': '950616', 'img_url': '/images/delivery_icon/JD.png' },
+      'UC': { 'name': '优速快递', 'phone': '95349', 'img_url': '/images/qishou@2x.png' },
+      'DBL': { 'name': '德邦快递', 'phone': '95353', 'img_url': '/images/delivery_icon/DBL.png' },
+      'ZJS': { 'name': '宅急送', 'phone': '400-678-9000', 'img_url': '/images/qishou@2x.png' },
+      'TNT': { 'name': 'TNT快递', 'phone': '400-820-9868', 'img_url': '/images/qishou@2x.png' },
+      'UPS': { 'name': 'UPS', 'phone': '400-820-8388', 'img_url': '/images/qishou@2x.png' },
+      'DHL': { 'name': 'DHL', 'phone': '95380', 'img_url': '/images/qishou@2x.png' },      
+      'FEDEX': { 'name': 'FEDEX联邦(国内件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
+      'FEDEX_GJ': { 'name': 'FEDEX联邦(国际件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
+    }
+    return config[shipperCode] || {};
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+})
\ No newline at end of file

pages/check_logistics/check_logistics.json

+{
+  "navigationBarTitleText": "查看物流"
+}
\ No newline at end of file

pages/check_logistics/check_logistics.wxml

+<!-- <view class="ditu_box">
+    <map id="map" longitude="103.324520" latitude="28.099994" scale="14" controls="{{controls}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" polyline="{{polyline}}" bindregionchange="regionchange" show-location style="width: 100%; height: 430rpx;"></map>
+</view> -->
+<!-- 订单信息 -->
+<view class="wm_sj_xq_box"style="padding-top: 0">
+    <view class="yh_wl_top" style="margin-top: 17rpx">
+        <view class="wl_top_img"><image src="{{clientImgPath}}{{logisticLogo}}"></image></view>
+        <view class="wl_top_r">
+            <view class="wl_top_t">{{shipperName}}</view>
+            <view class="wl_top_z">运单号: {{logisticCode}}</view>
+            <view class="wl_top_z">官方电话: {{phone}}</view>
+        </view>
+    </view>
+    <!-- 运输流程记录 -->
+    <view class="yh_wl_tops">
+
+    <block wx:for='{{list}}' wx:key='{{index}}' wx:for-item="item">
+      <view class="wl_zi">           
+            <view class="wl_z">            
+              <!-- 灰色状态 -->
+              <view wx:if='{{index!=0}}' class="wl_z_qiu"></view>
+              <!-- 红色状态 -->
+              <view wx:if='{{index==0}}' class="wl_z_qius"></view>   
+              <view wx:if='{{index!=(list.length-1)}}' class="wl_z_sxi"></view>           
+            </view>
+            <view class="{{index==0 ? 'wl_r_color':'wl_r'}}">
+                <view class="wl_r_t">{{item.AcceptTime}}</view>
+                <view class="wl_r_b"> {{item.AcceptStation}}</view>
+            </view>
+        </view>
+    </block>       
+    </view>
+       
+
+</view>

pages/check_logistics/check_logistics.wxss

+/* pages/wm_yh_xq/wm_yh_xq.wxss */
+page{
+  background: #F3F3F3;
+}
+.ditu_box{
+  width: 100%;
+}
+image{
+  width: 100%;height: 100%;display: block;
+}
+.yh_wl_top{
+width:100%;
+background:#ffffff;
+border-radius:20rpx ;
+padding: 30rpx 16rpx;
+  box-sizing: border-box;
+ display: flex;
+ margin-bottom: 20rpx;
+}
+.yh_wl_tops{
+width:100%;
+background:#ffffff;
+border-radius:20rpx ;
+padding: 64rpx 16rpx;
+  box-sizing: border-box;
+}
+.wl_top_img{
+  width:100rpx;
+height:100rpx;
+margin-right: 38rpx;
+}
+.wl_top_z{
+  font-size:22rpx;
+font-weight:400;
+color:rgba(51,51,51,1);
+line-height: 22rpx;
+margin-top: 15rpx;
+}
+.wl_top_t{
+  font-size:26rpx;
+font-weight:400;
+color:rgba(51,51,51,1);
+line-height: 26rpx;
+}
+.wl_zi{
+display: flex;
+}
+.wl_l_t{
+  font-size:22rpx;
+font-weight:500;
+color:rgba(134,134,134,.6);
+}
+.wl_l_b{
+  font-size:18rpx;
+font-weight:500;
+color:rgba(134,134,134,.6);
+}
+.wl_z{
+  width: 88rpx;
+}
+.wl_z_sxi{
+  width:2rpx;
+height:100%;
+background: rgba(134,134,134,.4);
+margin: 0 auto;
+}
+.wl_r{
+font-size:24rpx;
+font-weight:500;
+color:rgba(134,134,134,.6);
+
+}
+.wl_r_color{
+font-size:24rpx;
+font-weight:500;
+color:#f64f15;
+width: 500rpx;
+margin-bottom:50rpx;
+}
+.wl_z_qiu{
+  width:18rpx;
+height:18rpx;
+background:rgba(221,221,221,1);
+border-radius:50%;
+margin: 0 auto;
+}
+.wl_z_qius{
+  width:18rpx;
+height:18rpx;
+background:#f64f15;
+border-radius:50%;
+margin: 0 auto;
+}
+.wl_z_imgs{
+  width:50rpx;
+height:50rpx;
+margin: 0 auto;
+}
+.wl_z_imgss{
+  width:40rpx;
+height:30rpx;
+margin: 0 auto;
+}
+.wl_z_imgsss{
+  width:40rpx;
+height:40rpx;
+margin: 0 auto;
+}
+
+.wl_l{
+  width: 75rpx;
+}
+.wl_r{
+   width: 500rpx;
+   margin-bottom:50rpx;
+}
\ No newline at end of file

pages/index/index.wxml

@@ -76,9 +76,9 @@
 <!-- 设置邀请码 -->
 
 	<!-- 前往拼团中心的悬浮窗 -->
-	<navigator class="tupinguser" hover-class="none" url="/pages/lmping/user/user">
+	<!-- <navigator class="tupinguser" hover-class="none" url="/pages/lmping/user/user">
 		<image class="imgs" src="{{clientImgPath}}/images/lmping/pinguserbtn.png" mode=""></image>
-	</navigator>
+	</navigator> -->
 
 </view>
 

pages/lmping/hometwo/hometwo.wxss

@@ -143,7 +143,7 @@
 
 	border: 16rpx solid;
 	border-radius: 20rpx;
-	border-image:url('https://luma.jxdsy.cn/static/applet5/images/lmping/proshopborder.png') 30 30 round;
+	border-image:url('https://pindev.jxdsy.cn/static/applet5/images/lmping/proshopborder.png') 30 30 round;
 	margin-top: -24rpx;
 	padding: 20rpx;
 

pages/lmping/myfans/myfans.wxss

@@ -62,8 +62,8 @@ page {
 
 .renterslist .renteritem .renteritem_l {
   text-align: center;
-  padding-right: 30rpx;
-  width: 30%;
+  padding-right: 20rpx;
+  width: 28%;
 }
 
 .renterslist .renteritem .renteritem_l .usertxsx {
@@ -87,11 +87,11 @@ page {
 
 .renterslist .renteritem .renteritem_r {
   border-left: 1px solid #DCDCDC;
-  padding-left: 35rpx;
+  padding-left: 20rpx;
 }
 
 .renterslist .renteritem .renteritem_r .r_infotest {
   color: #5A5959;
-  font-size: 30rpx;
+  font-size: 28rpx;
   margin-bottom: 20rpx;
 }
\ No newline at end of file

pages/lmping/pushcard/pushcard.js

@@ -68,7 +68,7 @@ Page({
       y: 5,
       canvasId: 'tki-qrcode-canvas',
       //typeNumber: 10,
-      text: `https://luma.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`,
+      text: `https://pindev.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`,
       image: {
         // imageResource: "",//res.path,
         // dx: 85,
@@ -214,7 +214,7 @@ Page({
       console.info(len,"len");
       
       let qcodeobj = {
-        text: `https://luma.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`,
+        text: `https://pindev.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`,
         size: 220,//bgObj.width*0.2
         dx: 170,//bgObj.width*0.05
         dy: 410//bgObj.height - bgObj.width*0.25

pages/lmping/user/user.js

@@ -9,6 +9,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    hidden:false,
+
     clientImgPath,
 
     join_income: 0,//参团收益
@@ -29,6 +31,17 @@ Page({
    */
   onLoad: function (options) {
 
+  },
+  setUserInfo(e) { //点击了授权 
+    if (e.detail) {
+      this.setData({
+          hidden: false,
+      });
+      
+      this.getfundata();
+      this.ToSpellhome();//获取用户统计信息
+      
+    }
   },
   //获取首页信息
   ToSpellhome() {
@@ -71,6 +84,7 @@ Page({
         this.setData({
           userInfo: res.data.info,
         })
+        wx.setStorageSync('userInfo', res.data)
 
         if(res.data.info.mobile=="" || res.data.info.mobile==null){
           //去绑定手机号~
@@ -87,19 +101,26 @@ Page({
     let types = e.currentTarget.dataset.type;
     // 1 悦想拼余额
     // 2 悦想杯
+    //3 参团收益
     // is_pay==1 才可以转
     // status==4 可以转
 
     
     if(types==1 && this.data.spell_money.money==0){
       wx.showToast({
-        title: "拼团余额金额不足!!",
+        title: "拼团余额不足!",
         icon:"none"
       })
       return;
     }else if(types==2 && this.data.spell_gold.money ==0){
       wx.showToast({
-        title: "悦想杯金额不足!!",
+        title: "悦想杯不足!",
+        icon:"none"
+      })
+      return;
+    }else if(types==3 && this.data.join_income ==0){
+      wx.showToast({
+        title: "参团收益不足!",
         icon:"none"
       })
       return;
@@ -109,7 +130,7 @@ Page({
     if (types == 1 && this.data.spell_money.status != 4) {
       //悦想拼余额
       wx.showToast({
-        title: "您暂时不可转到佣金",
+        title: "您暂时不可转到佣金!",
         icon:"none"
       })
       return false;
@@ -117,7 +138,7 @@ Page({
     } else if (types == 2 && this.data.spell_gold.is_pay != 1) {
       // 悦想杯
       wx.showToast({
-        title: "您暂时不可转到佣金",
+        title: "您暂时不可转到佣金!",
         icon:"none"
       })
       return false;
@@ -139,6 +160,7 @@ Page({
                 // icon: "none"
               })
               this.ToSpellhome();//操作成功重新刷新数据
+              this.getfundata();//刷新用户信息~
             } else {
               wx.showToast({
                 title: res.msg,
@@ -168,6 +190,15 @@ Page({
   onShow: function () {
     this.getfundata();
     this.ToSpellhome();//获取用户统计信息
+
+    //授权弹窗
+    if(!wx.getStorageSync('userInfo')){
+      this.setData({
+        hidden:true,
+      });
+      return;
+    }
+
   },
 
   /**

pages/lmping/user/user.json

 {
-  "usingComponents": {},
+  "usingComponents": {
+    
+  },
   "navigationBarTitleText": "拼团中心",
   "navigationBarBackgroundColor":"#3b3b3b",
   "navigationBarTextStyle": "white"

pages/lmping/user/user.wxml

@@ -39,9 +39,9 @@
 						<view class="tongjival">{{total_spell_value?total_spell_value:0}}</view>
 					</navigator>
 					<!-- /pages/personal/I_bill/I_bill?current=7&source=7 -->
-					<navigator hover-class="none" url="/pages/lmping/profitlog/profitlog" class="tongjiitems">
-						<view class="tjtitle">参团收益</view>
-						<view class="tongjival">{{join_income?join_income:0}}</view>
+					<navigator hover-class="none" url="/pages/withdraw/withdraw" class="tongjiitems">
+						<view class="tjtitle">佣金余额</view>
+						<view class="tongjival">{{userInfo.commission?userInfo.commission:0}}</view>
 					</navigator>
 				</view>
 			</view>
@@ -53,17 +53,27 @@
 			<view class="contsitemsbox contsitemsbox1 flex1 jus-c">
 				<view class="contsitems">
 					<view class="pricesm ">
+						<view class="prval">{{spell_money.money	}}</view>
 						<text class="prttt">拼团余额</text>
-						<text class="prval">{{spell_money.money	}}</text>
 					</view>
 					<view bindtap="transferAccountsFun" data-type="1" class="prbtns">转到佣金</view>
 				</view>
 			</view>
+			<view class="contsitemsbox contsitemsbox1  flex1 jus-c">
+				<view class="contsitems ">
+					<navigator hover-class="none" url="/pages/lmping/profitlog/profitlog" class="pricesm">
+						<view class="prval">{{join_income?join_income:0}}</view>
+						<text class="prttt">参团收益</text>
+					</navigator>
+					<!-- <view bindtap="toyjWithdraw" class="prbtns">立即提现</view> -->
+					<view bindtap="transferAccountsFun" data-type="3" class="prbtns">转到佣金</view>
+				</view>
+			</view>
 			<view class="contsitemsbox flex1 jus-c">
 				<view class="contsitems ">
 					<view class="pricesm">
+						<view class="prval">{{spell_gold.money}}</view>
 						<text class="prttt">悦想杯</text>
-						<text class="prval">{{spell_gold.money}}</text>
 					</view>
 					<!-- <view bindtap="toyjWithdraw" class="prbtns">立即提现</view> -->
 					<view bindtap="transferAccountsFun" data-type="2" class="prbtns">转到佣金</view>
@@ -88,7 +98,14 @@
 					<image class="imgiocn imgiocn2" src="{{clientImgPath}}/images/lmping/witlog.png" mode=""></image>
 					<view class="navnames">提现记录</view>
 				</navigator>
-				<navigator url="/pages/lmping/lmvallog/lmvallog" class="navitem" hover-class="none">
+
+				<navigator  url="/pages/withdraw/withdraw" class="navitem"  hover-class="none">
+					<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
+					<view class="navnames">前往提现</view>
+				</navigator>
+
+
+				<navigator url="/pages/lmping/lmvallog/lmvallog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
 					<image class="imgiocn imgiocn3" src="{{clientImgPath}}/images/lmping/toplog.png" mode=""></image>
 					<view class="navnames">悦想值记录</view>
 				</navigator>
@@ -133,17 +150,33 @@
 					<view class="navnames">设置中心</view>
 				</navigator>
 
+				<navigator  url="/pages/lmping/profitlog/profitlog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
+					<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
+					<view class="navnames">收益明细</view>
+				</navigator>
 
-				<navigator  url="/pages/withdraw/withdraw" class="navitem" style="margin-top: 57rpx;" hover-class="none">
+
+				<navigator  url="/pages/aboutus/aboutusnav/aboutusnav" class="navitem" style="margin-top: 57rpx;" hover-class="none">
 					<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
-					<view class="navnames">前往提现</view>
+					<view class="navnames">关于我们</view>
 				</navigator>
 
+				<!-- /pages/Ishop/Ishop -->
+				<navigator  url="/pages/Ishop/Ishop" class="navitem" style="margin-top: 57rpx;" hover-class="none">
+					<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
+					<view class="navnames">我的店铺</view>
+				</navigator>
 
+				<navigator  url="/pages/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none">
+					<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
+					<view class="navnames">发货订单</view>
+				</navigator>
 				
 
 			</view>
 		</view>
 	</view>
 
+	<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo" />
+
 </view>
\ No newline at end of file

pages/lmping/user/user.wxss

@@ -223,7 +223,7 @@ page {
 
 /* 佣金统计 */
 .moneyconsts {
-	padding: 30rpx;
+	padding: 30rpx 10rpx;
 	background-color: #fff;
 	margin: 20rpx;
 	border-radius: 16rpx;
@@ -236,7 +236,9 @@ page {
 .moneyconsts .contsitemsbox {
 	width: 50%;
 }
-
+.moneyconsts .contsitems .pricesm{
+  text-align: center;
+}
 .moneyconsts .contsitems .pricesm .prttt {
 	color: #000000;
 	font-size: 30rpx;
@@ -245,7 +247,7 @@ page {
 .moneyconsts .contsitems .pricesm .prval {
 	color: #000000;
 	font-size: 36rpx;
-	margin-left: 16rpx;
+	/* margin-left: 16rpx; */
 	font-weight: bold;
 }
 

pages/order/order.js

@@ -521,13 +521,13 @@ Page({
   //查看物流
   logistics: function (order_id, action, vendor_id) {
     wx.navigateTo({
-      url: '/pages/shop/order/weidianorder/check_logistics/check_logistics?order_id=' + order_id + '&action=' + action + '&vendor_id=' + vendor_id
+      url: '/pages/check_logistics/check_logistics?order_id=' + order_id + '&action=' + action + '&vendor_id=' + vendor_id
     })
   },
   //跳转订单详情
   orderDetails: function (order_id) {
     wx.navigateTo({
-      url: '/pages/shop/order/weidianorder/weidianLine_item/weidianLine_item?order_id=' + order_id,
+      url: '/pages/orderdetail/orderdetail?order_id=' + order_id,
     })
   },
 
@@ -561,7 +561,7 @@ Page({
   //查看物流
   viewLogistics(refund_id) {
     wx.navigateTo({
-      url: '/pages/shop/order/weidianorder/logistics/logistics?refund_id=' + refund_id
+      url: '/pages/check_logistics/check_logistics?refund_id=' + refund_id
     });
   },
 

pages/order/order.wxml

@@ -16,7 +16,7 @@
 		</scroll-view>
 	</view>
 	<!-- 内容 -->
-	<view class="boxs" style="margin-top: 100rpx;">
+	<view class="boxs" style="margin-top: 50rpx;">
 		<!-- 正常订单 -->
 		<view wx:if="{{statusTab != 4}}">
 			<!-- 没有订单显示 -->

pages/orderdetail/orderdetail.js

 const app = getApp()
-import { orderDetail, requestOrder, orderPay, recommendList } from '../../api/order.js';
+import { orderDetail, requestOrder, orderPay } from '../../api/order.js';
 var timer = '';
 Page({
 
@@ -40,42 +40,10 @@ Page({
       order_id:options.order_id
     })
     that.initializedata();   
-    that.recommendList();
   },
   finished() { //倒计时结束
     wx.setStorageSync('isDelorder', 'daojishi');
     this.initializedata();   
-    this.recommendList();
-  },
-  recommendList(){
-    var that =this
-    recommendList({page:this.data.page}).then(res=>{
-      if (res.code == 0) {
-        let list = [];
-        if (that.data.page == 1) {
-          list = res.data.list
-        } else {
-          list = that.data.list.concat(res.data.list);
-        }
-        this.setData({
-          list: list,
-        })
-        if (res.data.list && res.data.list.length < 10) {
-          this.setData({
-            is_loading_done: true,
-          })
-        } else {
-          this.setData({
-            is_loading_done: false,
-          })
-        }
-      } else {
-        this.setData({
-          is_loading_done: true,
-        })
-      }
-      wx.hideLoading();
-    })    
   },
 
 // 分享弹窗11
@@ -266,7 +234,7 @@ painting: {
     },
     {
       type: 'text',
-      content: '鹿马自营',
+      content: '悦想自营',
       fontSize: 14,
       color: '#F64F15',
       textAlign: 'left',
@@ -386,27 +354,7 @@ eventGetImage (event) {
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    var that = this;
-    var is_loading_done = that.data.is_loading_done; //是否加载完毕
-    if (is_loading_done == false) { //还没加载完毕则继续加载
-      wx.showLoading({
-        title: '加载中',
-        mask: false
-      })
-      let page = that.data.page
-      that.setData({
-        page: page + 1
-      })
-      that.recommendList()
-    } else {
-      wx.showLoading({
-        title: '已全部加载完毕',
-        mask: false
-      })
-      setTimeout(function () {
-        wx.hideLoading()
-      }, 1000)
-    }
+    
   },
 
   /**

pages/orderdetail/orderdetail.wxml

@@ -133,7 +133,7 @@
 
 		<view class="li_boxs ali-z bt_hei">
 			<view class="sz_26 ">
-				鹿马优惠<text class="c_ff sz_26">({{code=='money'||mingle=='money'?'余额':code=='commission'|| mingle=='commission'?'佣金':"无"}}抵扣)
+				悦想优惠<text class="c_ff sz_26">({{code=='money'||mingle=='money'?'余额':code=='commission'|| mingle=='commission'?'佣金':"无"}}抵扣)
 				</text>
 			</view>
 
@@ -304,7 +304,7 @@
 	</view>
 </view>
 <!-- 猜你会买 -->
-<view class="flexc mt-40 mb-40" wx:if="{{detail.status!=10}}">
+<!-- <view class="flexc mt-40 mb-40" wx:if="{{detail.status!=10}}">
 	<view class="duanxian"></view>
 	<view class="sz_32 bt_hei twb ml-20 mr-20">猜你会买</view>
 	<view class="duanxian"></view>
@@ -324,7 +324,7 @@
 		</view>
 	</view>
 
-</view>
+</view> -->
 
 
 <!-- 底部 -->

pages/set/set.wxml

@@ -27,9 +27,9 @@
             </view>
           </view>
         </view>
-        <view class="xiangyou ml-20">
+        <!-- <view class="xiangyou ml-20">
           <image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
-        </view>
+        </view> -->
       </view>
     </view>
     <view class="xian"></view>
@@ -37,9 +37,9 @@
       <view class="sz_30 bt_hei">昵称</view>
       <view class="ali-c">
         <view class="sz_30 inp_hui">{{userInfo.nickname}}</view>
-        <view class="xiangyou ml-20">
+        <!-- <view class="xiangyou ml-20">
           <image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
-        </view>
+        </view> -->
       </view>
     </view>
     <view class="xian"></view>
@@ -48,9 +48,9 @@
       <view class="sz_30 bt_hei">手机号</view>
       <view class="ali-c" >
         <view class="sz_30 inp_hui">{{userInfo.mobile|| mobile ||""}}</view>
-        <view class="xiangyou ml-20">
+        <!-- <view class="xiangyou ml-20">
           <image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
-        </view>
+        </view> -->
       </view>
     </view>
     <view class="xian"></view>

pages/shop/shops/weidian/ping_details/ping_details.js

@@ -97,6 +97,18 @@ Page({
 
     rentersum:0,
 
+
+    showpuptwos:false,
+
+  },
+  //关闭拼团弹窗
+  onClosetwos(){
+    this.setData({
+      showpuptwos:false
+    })
+    wx.switchTab({
+      url: '/pages/lmping/user/user',
+    })
   },
   //点击拼都到这里面
   topingfun(e) {
@@ -122,6 +134,9 @@ Page({
           title: res.msg,
           icon: "none"
         })
+        this.setData({
+          showpuptwos:true,
+        })
       }else if(res.code == 1){
         wx.showModal({
 					title: '温馨提示',
@@ -171,7 +186,7 @@ Page({
   //充值 微信充值
   getmoneyPay() {
     moneyPay({
-      money: this.data.pingmoney,
+      money: this.data.pingmoney,//1
       code: 'weixin',
       qrcode_type: "",//2推创客，5邀请好友
       share_id: "",

pages/shop/shops/weidian/ping_details/ping_details.json

@@ -4,7 +4,8 @@
     "parameter": "/components/dialog/parameter/parameter",
     "tooltis": "/components/dialog/tooltiptext/tooltiptext",
     "evaluate_wd": "/components/dialog/evaluate_wd/evaluate_wd",
-    "address_list": "/components/dialog/address_list/address_list"
+    "address_list": "/components/dialog/address_list/address_list",
+    "van-popup":"/vant/weapp/lib/popup/index"
   },
   "navigationBarTitleText": "商品详情"
   

pages/shop/shops/weidian/ping_details/ping_details.wxml

@@ -190,3 +190,11 @@
 <!-- 选收货地址 -->
 <address_list id='address_list' bind:changeAddr="changeAddr" addr_list="{{addr_list}}"
 		addr_id="{{submitaddrid}}"  type='2'/>
+
+
+<van-popup show="{{ showpuptwos }}" bind:close="onClosetwos">
+	<view bindtap="onClosetwos" class="cantuansuccpup">
+		<image class="imgspupimg" src="{{clientImgPath}}/images/lmping/succcantuan.png" mode=""></image>
+		<image class="clears" src="{{clientImgPath}}/images/lmping/clearicontuan.png"></image>
+	</view>
+</van-popup>

pages/shop/shops/weidian/ping_details/ping_details.wxss

@@ -593,4 +593,23 @@ padding: 4rpx 10rpx 4rpx 10rpx;
 .guarantee .tistit{
   color: #383838;
   font-size: 26rpx;
+}
+
+/* add xx */
+.cantuansuccpup{
+  position: relative;
+  padding-bottom: 100rpx;
+}
+.imgspupimg{
+  width: 750rpx;
+  height: 920rpx;
+}
+
+.cantuansuccpup .clears{
+  width: 58rpx;
+  height: 58rpx;
+  position: absolute;
+  bottom: 180rpx;
+  left: 50%;
+  margin-left: -29rpx;
 }
\ No newline at end of file

pages/withdraw/withdraw.js

@@ -7,6 +7,8 @@ import {
 import {
   havepassword
 } from '../../api/basicInformation.js';
+
+import { getUserInfo } from '../../api/user.js';
 Page({
   /**
    * 页面的初始数据
@@ -34,6 +36,27 @@ Page({
       bank_id: options.bank_id ? options.bank_id : 0,
       currentTab: options.bank_id ? 2 : 0,
     })
+
+    this.getfundata();
+  },
+  //获取基础用户信息
+  getfundata() {
+    getUserInfo({
+
+    }).then((res) => {
+      if (res.code == 0) {
+        this.setData({
+          userInfo: res.data.info,
+        })
+
+        if(res.data.info.mobile=="" || res.data.info.mobile==null){
+          //去绑定手机号~
+          wx.redirectTo({
+            url: '/pages/register/register',
+          })
+        }
+      }
+    })
   },
   // 跳转银行卡列表
   bankCardList: function (e) {
@@ -76,7 +99,7 @@ Page({
   // 支付密码弹窗组件
   showInputLayer: function (e) {
     var that = this;
-    if (parseInt(that.data.money * 100) > parseInt(e.currentTarget.dataset.money * 100)) {
+    if (parseInt(that.data.money * 100) > parseInt(this.data.userInfo.commission * 100)) {
       app.showModal({
         content: "输入金额超过可提现余额！"
       })
@@ -112,11 +135,11 @@ Page({
       } else {
         wx.showModal({
           title: '温馨提示',
-          content: '您还未设置鹿马支付密码，请前往设置！',
+          content: '您还未设置悦想支付密码，请前往设置！',
           success: function (res) {
             if (res.confirm) {
               wx.navigateTo({
-                url: '/pages/personal/set/payment_code/payment_code',
+                url: '/pages/payment_code/payment_code',
               })
             }
           }
@@ -129,10 +152,11 @@ Page({
  
     var that = this;
     var type = e.currentTarget.dataset.type;
+    console.info(type,"type");
    
     if (type == 0) {
       that.setData({
-        money: e.currentTarget.dataset.commission,
+        money: this.data.userInfo.commission,//佣金
         ismoneyshow: !that.data.ismoneyshow
       })
     } else if (type == 1) {
@@ -231,7 +255,7 @@ Page({
 
 
       
-      //佣金提现到鹿马余额
+      //佣金提现到悦想余额
       if (that.data.totype == 0) {
         let params = {
           type: that.data.type,
@@ -247,9 +271,13 @@ Page({
               content: res.msg
             })
           } else {
-            wx.navigateTo({
-              url: "/pages/personal/transfer/transfer_succeed/transfer_succeed?type=转账余额&money=" + that.data.money
+            app.showModal({
+              content: res.msg
             })
+            // wx.navigateTo({
+            //   url: "/pages/personal/transfer/transfer_succeed/transfer_succeed?type=转账余额&money=" + that.data.money
+            // })
+
           }
         })
        } else if (that.data.totype == 1 || that.data.totype == 2) {
@@ -280,7 +308,7 @@ Page({
       if (res.code == 0) {
         this.selectComponent("#VerifyIdentity").hideModal();//信息验证成功后关闭弹窗
         wx.navigateTo({
-          url: "/pages/personal/withdraw/withdrawal_success/withdrawal_success?type=" + that.data.totype + "&money=" + that.data.money + "&intro=" + (that.data.bank ? that.data.bank.bank_name : '')
+          url: "/pages/withdrawal_success/withdrawal_success?type=" + that.data.totype + "&money=" + that.data.money + "&intro=" + (that.data.bank ? that.data.bank.bank_name : '')
         })
       } else {
         if(res.code ==-2){

pages/withdraw/withdraw.wxml

@@ -2,13 +2,15 @@
 <view class="boxs">
 	<view class="sz_30 c_bi te_ct mb-20">可提现佣金</view>
 	<view class="sz_72 c_bi te_ct mb-50" style="font-weight:bold;">
-		<block wx:if="{{type==0}}">{{member.commission}}</block>
+		<!-- <block wx:if="{{type==0}}">{{member.commission}}</block>
 		<block wx:elif="{{type==1}}">{{member.agent_brokerage}}</block>
-		<block wx:elif="{{type==2}}">{{gold}}</block>
+		<block wx:elif="{{type==2}}">{{gold}}</block> -->
+		<block>{{userInfo.commission?userInfo.commission:0}}</block>
 	</view>
 	<view class="topboxs ov" style="padding: 0;">
 		<view class="flex">
-			<view class="te_ct flex1 {{currentTab==0?'btnbeij':'btnbeijs'}}" data-current="0" bindtap="clickTab" style="width:33.33%;">
+			<view class="te_ct flex1 {{currentTab==0?'btnbeij':'btnbeijs'}}" data-current="0" bindtap="clickTab"
+				style="width:33.33%;">
 				<view class="topimg br_10 ov">
 					<image data-current="0" bindtap="clickTab" src="{{clientImgPath}}/images/uts/weixinfang.png"></image>
 				</view>
@@ -18,7 +20,7 @@
 
 
 
-		 <!-- <view class="te_ct {{currentTab==1?'btnbeij':'btnbeijs'}}" data-current="1" bindtap="clickTab" style="width:33.33% ">
+			<!-- <view class="te_ct {{currentTab==1?'btnbeij':'btnbeijs'}}" data-current="1" bindtap="clickTab" style="width:33.33% ">
 				<view class="topimg br_10 ov">
 					<image data-current="1" bindtap="clickTab" src="{{clientImgPath}}/images/uts/zhuanzhangss.png"></image>
 				</view>
@@ -27,7 +29,8 @@
 
 
 
-			<view class="te_ct flex1 {{currentTab==2?'btnbeij':'btnbeijs'}}" data-current="2" bindtap="clickTab" style="width:33.33%">
+			<view class="te_ct flex1 {{currentTab==2?'btnbeij':'btnbeijs'}}" data-current="2" bindtap="clickTab"
+				style="width:33.33%">
 				<view class="topimg br_10 ov">
 					<image data-current="2" bindtap="clickTab" src="{{clientImgPath}}/images/uts/yinhangka.png"></image>
 				</view>
@@ -37,19 +40,21 @@
 	</view>
 	<!-- 1 -->
 	<view class="{{currentTab==0?'tshow':'hidden'}}">
-		<form bindsubmit="userWithdraw" >
+		<form bindsubmit="userWithdraw">
 			<input type="hidden" name="totype" value="1" style="display:none"></input>
 			<view class="topbox_20 mt-20">
 				<view class="ali-c">
 					<view class="sz_30 bt_hei flex1">
 						提现佣金
 					</view>
-					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}" data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{gold}}">全部提现</view>
+					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}"
+						data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{gold}}">全部提现</view>
 				</view>
 				<view class="dj-b mt-50">
 					<view class="bt_min mb-20">￥</view>
 					<view class="sz_72 ipt_ho inputshuzi">
-						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInput" placeholder="0.00" placeholder-class="sz_72 ipt_hui"></input>
+						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInput" placeholder="0.00"
+							placeholder-class="sz_72 ipt_hui"></input>
 					</view>
 				</view>
 				<view class="xian"></view>
@@ -58,24 +63,37 @@
 					<view class="c_ff sz_30 ">（必填项）</view>
 				</view>
 				<view class="sz_30 bt_hei inputtext mt-20">
-					<input placeholder="请填写微信实名认证的真实姓名" name="bank_realname" value="{{bank_realname}}" type="text" maxlength="10" placeholder-class="sz_30 inp_hui" bindinput="bindKeyInput"></input>
+					<input placeholder="请填写微信实名认证的真实姓名" name="bank_realname" value="{{bank_realname}}" type="text" maxlength="10"
+						placeholder-class="sz_30 inp_hui" bindinput="bindKeyInput"></input>
+				</view>
+			</view>
+			<view class="sz_24 inp_hui mt-30" style="color:#f64f15">
+
+				提现规则：500元以下预计秒到；500元以上T+1到账；节假日顺延；提现时间为：8:00—21:00；提现最低额度为：0.32元；每日最多提现三次，提现间隔最少15分钟一次。
+				<view>
+					提现手续费：个人提现5%。
 				</view>
 			</view>
-			<view class="sz_24 inp_hui mt-30"  style="color:#f64f15">温馨提示：提现到微信零钱预计两小时内到达,提现到银行卡正常到账时间为T+1，节假日顺延；提现时间为：8:00-21:00</view> 
-			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}" wx:if="{{type==0}}" data-money='{{member.commission}}' form-type="submit" bindtap="showInputLayer">申请提现</button>
-			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}" wx:elif="{{type==1}}" data-money='{{member.agent_brokerage}}' form-type="submit" bindtap="showInputLayer">申请提现</button>
-			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}" wx:elif="{{type==2}}" data-money='{{gold}}' form-type="submit" bindtap="showInputLayer">申请提现</button>
-			
+			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}"
+				wx:if="{{type==0}}" data-money='{{member.commission}}' form-type="submit" bindtap="showInputLayer">申请提现</button>
+			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}"
+				wx:elif="{{type==1}}" data-money='{{member.agent_brokerage}}' form-type="submit"
+				bindtap="showInputLayer">申请提现</button>
+			<button class=" mt-50 {{inputLength == 0? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}"
+				wx:elif="{{type==2}}" data-money='{{gold}}' form-type="submit" bindtap="showInputLayer">申请提现</button>
+
 
-			<view class="flexc mt-60" >
+			<view class="flexc mt-60">
 				<view class="flexc mr-50">
-					<navigator class="sz_32 xi_hui" url="/pages/personal/Ishop/wxStep/wxStep" hover-class="none">了解微信实名认证</navigator>
+					<navigator class="sz_32 xi_hui" url="/pages/wxStep/wxStep" hover-class="none">了解微信实名认证
+					</navigator>
 					<view class="xiangyouimg ml-10">
 						<image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
 					</view>
 				</view>
 				<view class="flexc">
-					<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录</navigator>
+					<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录
+					</navigator>
 					<view class="xiangyouimg ml-10">
 						<image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
 					</view>
@@ -93,28 +111,31 @@
 					<view class="sz_30 bt_hei flex1">
 						转出佣金
 					</view>
-					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}" data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{member.gold}}">全部提现</view>
+					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}"
+						data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{member.gold}}">全部提现</view>
 				</view>
 				<view class="dj-b mt-50">
 					<view class="bt_min mb-20">￥</view>
 					<view class="sz_72 ipt_ho inputshuzi">
-						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInput" placeholder="0.00" placeholder-class="sz_72 ipt_hui"></input>
+						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInput" placeholder="0.00"
+							placeholder-class="sz_72 ipt_hui"></input>
 					</view>
 				</view>
 			</view>
 			<view class="sz_24 inp_hui mt-30">温馨提示：请认真核对转出佣金，一旦转出成功不可退回。</view>
-			<button class=" mt-50 {{inputLength == 0 ? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}" form-type="submit" bindtap="showInputLayer">确定转出</button>
+			<button class=" mt-50 {{inputLength == 0 ? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}"
+				form-type="submit" bindtap="showInputLayer">确定转出</button>
 		</form>
-			<view class="flexc mt-50">
-				<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录</navigator>
-				<view class="xiangyouimg ml-10">
-					<image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
-				</view>
+		<view class="flexc mt-50">
+			<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录</navigator>
+			<view class="xiangyouimg ml-10">
+				<image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
 			</view>
+		</view>
 	</view>
 	<!-- 3 -->
 
-	
+
 	<view class="{{currentTab==2?'tshow':'hidden'}}">
 		<form bindsubmit="userWithdraw">
 			<input type="hidden" name="totype" value="2" style="display:none"></input>
@@ -124,12 +145,14 @@
 					<view class="sz_30 bt_hei flex1">
 						提现佣金
 					</view>
-					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}" data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{gold}}">全部提现</view>
+					<view class="c_ff sz_30" bindtap="allMoney" data-type="{{type}}" data-commission="{{member.commission}}"
+						data-agent_brokerage="{{member.agent_brokerage}}" data-gold="{{gold}}">全部提现</view>
 				</view>
 				<view class="dj-b mt-50">
 					<view class="bt_min mb-20">￥</view>
 					<view class="sz_72 ipt_ho inputshuzi">
-						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInputs" placeholder="0.00" placeholder-class="sz_72 ipt_hui"></input>
+						<input type="digit" name="money" value="{{money}}" bindinput="bindKeyInputs" placeholder="0.00"
+							placeholder-class="sz_72 ipt_hui"></input>
 					</view>
 				</view>
 				<view class="xian"></view>
@@ -137,7 +160,7 @@
 					<!-- 有银行卡 -->
 					<block wx:if="{{bank}}">
 						<view class="sz_30 bt_hei">到账银行卡</view>
-						<view class="ali-c mt-30"  data-type="{{type}}" bindtap="bankCardList">
+						<view class="ali-c mt-30" data-type="{{type}}" bindtap="bankCardList">
 							<view class="touxiangimg ov">
 								<image src="{{clientImgPath}}/images/bank/logo/{{bank.bankbg}}.png"></image>
 							</view>
@@ -168,11 +191,16 @@
 				</view>
 			</view>
 			<view class="sz_24 max_hui mt-30">温馨提示：单笔最少提现1000元，单笔最多提现5000元；到账时间为T+1</view>
-			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}" wx:if="{{type==0}}" data-money='{{member.commission}}'  form-type="submit" bindtap="showInputLayer">T+1到账，申请提现</button>
-			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}}" wx:elif="{{type==1}}" data-money='{{member.agent_brokerage}}'  form-type="submit" bindtap="showInputLayer">T+1到账，申请提现</button>
-			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}}" wx:elif="{{type==2}}" data-money='{{gold}}'   form-type="submit" bindtap="showInputLayer">T+1到账，申请提现</button>
+			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}} {{ismoneyshow==false? 'buttons':'button'}}"
+				wx:if="{{type==0}}" data-money='{{member.commission}}' form-type="submit"
+				bindtap="showInputLayer">T+1到账，申请提现</button>
+			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}}" wx:elif="{{type==1}}"
+				data-money='{{member.agent_brokerage}}' form-type="submit" bindtap="showInputLayer">T+1到账，申请提现</button>
+			<button class="mt-50 {{inputLengths == 0 ? 'buttons':'button'}}" wx:elif="{{type==2}}" data-money='{{gold}}'
+				form-type="submit" bindtap="showInputLayer">T+1到账，申请提现</button>
 			<view class="flexc mt-50">
-				<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录</navigator>
+				<navigator class="sz_32 xi_hui" url="/pages/withdraw_record/withdraw_record" hover-class="none">查看提现记录
+				</navigator>
 				<view class="xiangyouimg ml-10">
 					<image src="{{clientImgPath}}/images/uts/quanbu@2x.png"></image>
 				</view>
@@ -190,4 +218,4 @@
 
 
 <!-- 登陆授权弹窗 -->
-<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo"/>
+<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo" />
\ No newline at end of file

pages/withdraw_record/withdraw_record.js

@@ -17,6 +17,8 @@ Page({
     pageNum: 0,
     is_loading_done: false, //是否显示加载完，默认没有加载完
 
+    defaultdate:"",
+
     array:[
       {type:'',text:'全部'},
       {type:'user',text:'用户'},
@@ -88,6 +90,21 @@ Page({
   onLoad: function (options) {
     var that=this;
     that.initializedata();
+
+    // defaultdate
+    let d = new Date();
+    let YY = d.getFullYear();
+    let MM = d.getMonth()+1;
+    if(MM<10){
+      MM =  "0"+MM;
+    }
+    this.setData({
+      defaultdate:`${YY}-${MM}`
+    })
+
+
+
+
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/withdraw_record/withdraw_record.wxml

@@ -8,7 +8,7 @@
     <view class="ali-z mt-30">
       <view class="ali-c">
         <view class="ali-c" bindtap="showDatePicker">
-          <view class="sz_30 xiala_hui">{{currentMoth}}</view>
+          <view class="sz_30 xiala_hui">{{currentMoth!="1970-01"?currentMoth:defaultdate}}</view>
           <view class="xiangxiaimg ml-10">
             <image src="{{clientImgPath}}/images/index/xiala_hui@2x.png"></image>
           </view>

pages/withdrawal_success/withdrawal_success.wxml

@@ -22,7 +22,7 @@
       <view class="flex ">
           <view class="dian mr-20 mt-10"></view>
             <view class="bt_hei sz_30 flex1 mb-30">
-            <text wx:if='{{type==1}}'> 申请已成功，请您注意查收,到账时间预计2两小时内。</text>
+            <text wx:if='{{type==1}}'> 申请已成功，请您注意查收。</text>
             <text wx:else> 申请已提交等待银行处理；提现到账时间为T+1,请您耐心等待。</text>            
             <view class="sz_24 inp_hui mt-15"></view>
           </view>

pages/wxStep/wxStep.js

+const app = getApp();
+var clientImgPath = app.globalData.clientImgPath;
+var img_host = app.globalData.ImgPath;
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    host_img: app.globalData.ImgPath,
+    clientImgPath: clientImgPath
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  }
+})
\ No newline at end of file

pages/wxStep/wxStep.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "了解微信实名认证"
+}
\ No newline at end of file

pages/wxStep/wxStep.wxml

+<view class="boxs">
+    <view class="wxbzimg"><image src="{{clientImgPath}}/images/uts/wxshiming.png"></image></view>
+</view>

pages/wxStep/wxStep.wxss

+/* pages/wxStep/wxStep.wxss */
+/* pages/personal//Ishop/wxStep/wxStep.wxss */
+page{
+  position: relative;
+  background: rgba(245, 242, 242, 1);
+  }
+  .wxbzimg{
+    width: 470rpx;
+    height: 1400rpx;
+    margin: 0 auto;
+  }
\ No newline at end of file

project.private.config.json

@@ -101,6 +101,17 @@
           "pathName": "pages/payment_code/payment_code",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "拼团商品详情",
+          "pathName": "pages/shop/shops/weidian/ping_details/ping_details",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的店铺",
+          "pathName": "pages/Ishop/Ishop",
+          "scene": null
         }
       ]
     }