12

.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Haowmt_wxapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1594634830742</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

README.en.md

@@ -28,9 +28,3 @@ Software architecture description
 
 #### Gitee Feature
 
-1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4. The most valuable open source project [GVP](https://gitee.com/gvp)
-5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6. The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

api/user.js

@@ -140,6 +140,14 @@ export function getAboutus(){
   return request.get('about_us');
 }
 /**
+ * 联系店长
+ *
+ * 
+*/
+export function getStore(){
+  return request.get('store');
+}
+/**
  * 活动状态
  * 
 */

app.json

@@ -1,10 +1,10 @@
 {
   "pages": [
-    "pages/index/index", 
+    "pages/index/index",
+    "pages/register/index",
+    "pages/retrieve_password/index",
     "pages/user_pwd_edit/index",
     "pages/user_info/index",
-    
-    
     "components/codeauthorize/codeauthorize",
     "pages/order_receipt/index",
     "pages/user_us/index",
@@ -12,10 +12,8 @@
     "pages/my_wallet/index",
     "pages/wallet_detail/index",
     "pages/Today_detail/index",
-    "pages/login/index",
     "pages/my_fans/index",
     "pages/user_cash/index",
-    
     "pages/order_list/index",
     "pages/user/user",
     "pages/goods_details/index",
@@ -39,7 +37,6 @@
     "pages/goods_cate/goods_cate",
     "pages/goods_list/goods_list",
     "pages/user_address_list/index",
-    
     "pages/goods_search/index",
     "components/navbar/index",
     "components/orderGoods/index",
@@ -53,9 +50,8 @@
     "components/coupon-list-window/index",
     "components/address-window/index",
     "components/home/index",
-    "components/write-off/index"
-    
-    
+    "components/write-off/index",
+    "pages/user_contact/index"
   ],
   "subPackages": [
     {

components/product-window/index.wxml

@@ -3,9 +3,9 @@
       <view class='pictrue'><image src='{{productSelect.image}}'></image></view>
       <view class='text'>
          <view class='line1'>{{productSelect.store_name}}</view>
-         <view class='money fontcolor'>
+         <view class='money font-color'>
           ￥<text class='num'>{{productSelect.price}}</text>
-          <!-- <text class='stock' wx:if="{{isShow}}">库存: {{productSelect.stock}}</text> -->
+          <text class='stock' wx:if="{{isShow}}">库存: {{productSelect.stock}}</text>
           <text class='stock' wx:if="{{limitNum}}">限量: {{productSelect.quota_show}}</text>
          </view>
       </view>

pages/Today_detail/index.wxml

@@ -14,23 +14,29 @@
      <block wx:for="{{recordList}}" wx:key>
       <view class='list'>
           <view class='item'>
-            <view class='data'>{{item.time}}</view>
+            <!-- <view class='data'>{{item.time}}</view> -->
             <view class='listn'>
-              <block wx:for="{{item.list}}" wx:for-item='child' wx:key>
+          
                 <view class='itemn acea-row row-between-wrapper'>
                   <view>
-                      <view class='name line1'>{{child.title}}</view>
-                      <view>{{child.add_time}}</view>
+                      <view class='name line1'>{{item.title}}</view>
+                      <view>{{item.add_time}}</view>
                   </view>
-                  <view class='num font-color' wx:if="{{child.pm == 1}}">+{{child.number}}</view>
-                  <view class='num'  wx:else>-{{child.number}}</view>
+                  <view class='num font-color' wx:if="{{item.pm == 1}}">+{{item.number}}</view>
+                  <view class='num'  wx:else>-{{item.number}}</view>
                 </view>
-              </block> 
+
             </view>
           </view>
       </view>
      </block> 
     </view>
+    <view class='noCart' wx:if="{{recordList.length == 0 && page > 1}}">
+      <view class='pictrue'>
+        <image src='/images/record_icon_blank.png'></image>
+        <view class="nocatr_p">暂时没有数据</view>
+      </view>
+    </view>
 </view>
 
 

pages/Today_detail/index.wxss

@@ -1,3 +1,33 @@
 /* pages/Today_detail/index.wxss */
-.commission-details .promoterHeader .headerCon .money{font-size:36rpx;}
-.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}
+.commission-details .promoterHeader .headerCon .money {
+  font-size: 36rpx;
+}
+
+.commission-details .promoterHeader .headerCon .money .num {
+  font-family: 'Guildford Pro';
+}
+
+.noCart {
+  margin-top: 171rpx;
+  padding-top: 0.1rpx;
+}
+
+.noCart .pictrue {
+  width: 292rpx;
+  height: 292rpx;
+  margin: 48rpx auto 56rpx auto;
+}
+
+.noCart .pictrue image {
+  width: 100%;
+  height: 100%;
+}
+
+.nocatr_p {
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  color: #999999;
+  margin-top: 64rpx;
+}

pages/Today_income/index.wxml

@@ -22,7 +22,7 @@
     </navigator>
     <navigator url="/pages/Today_detail/index?type=1" class="today_b">
       <view class="today_p">已结算收入</view>
-      <view class="today_p1">￥0.00 <text class="today_icon iconfont icon-xiangyou"></text> </view>
+      <view class="today_p1">￥{{TodayDate.all || 0.00}} <text class="today_icon iconfont icon-xiangyou"></text> </view>
     </navigator>
   </view>
 </view>

pages/goods_details/index.wxml

@@ -21,12 +21,12 @@
       </view>
       <view class='share_a' bindtap='listenerActionSheet'> <image src="/images/icon_chare.png" class="share_img"></image> 分享</view>
     </view>
-    <view class="share_b">
+    <!-- <view class="share_b">
       <view class="share_c">
         <view class="share_p1">商品参数</view>
         <view class="share_p2 iconfont icon-xiangyou"></view>
       </view>
-    </view>
+    </view> -->
   </view>
   <!-- <view class='attribute acea-row row-between-wrapper' bindtap='selecAttr'>
     <view>{{attr}}：

pages/goods_details/index.wxss

@@ -285,7 +285,7 @@ action-sheet-item {
 }
 
 .poster-pop .save-poster {
-  background-color: #df2d0a;
+  background-color: #FD5400;
   font-size: ：22rpx;
   color: #fff;
   text-align: center;

pages/goods_search/index.wxml

@@ -7,12 +7,12 @@
       </view>
       <view class='bnt' bindtap='searchBut'>搜索</view>
    </view>
-   <view class='title'>热门搜索</view>
+   <!-- <view class='title'>热门搜索</view>
    <view class='list acea-row'>
      <block wx:for="{{hotSearchList}}" wx:key>
       <view class='item' bindtap='setHotSearchValue' data-item="{{item}}">{{item}}</view>
      </block> 
-   </view>
+   </view> -->
    <view class='line'></view>
    <goodList bastList="{{bastList}}" wx:if="{{bastList.length > 0}}"></goodList>
    <view class='loadingicon acea-row row-center-wrapper' wx:if='{{bastList.length > 0}}'>
@@ -21,5 +21,5 @@
 </view>
 <view class='noCommodity'>
    <view class='pictrue' wx:if="{{bastList.length == 0}}"><image src='/images/noSearch.png'></image></view>
-   <recommend host_product='{{host_product}}' wx:if="{{bastList.length == 0 && page > 1}}"></recommend>
+   <!-- <recommend host_product='{{host_product}}' wx:if="{{bastList.length == 0 && page > 1}}"></recommend> -->
 </view>

pages/index/index.wxml

@@ -68,7 +68,7 @@
 						<view class="list_c">
 							<view class="list_p3"><text>￥</text>{{item.now_price}}</view>
 							<view class="list_p4"><text>￥</text>{{item.price}}</view>
-							<view class="list_url">立即抢 <text class="iconfont icon-xiangyou"></text> </view>
+							<!-- <view class="list_url">立即抢 <text class="iconfont icon-xiangyou"></text> </view> -->
 						</view>
 					</view>
 				</view>

pages/login/index.wxml

@@ -1,22 +0,0 @@
-<!--pages/login/index.wxml-->
-<navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}"></navbar>
-<view class="login">
-  <image src="/images/login_logo.png" class="login_img"></image>
-</view>
-<form class='form' bindsubmit='loginSubmit'>
-  <view class="login_a">
-    <view class="login_p">登录</view>
-    <view class="inputa">
-      <input class="input"  type="number" name="account" placeholder="手机号码"   />
-    </view>
-    <view class="inputb">
-      <input class="input"  type="password" name="password" placeholder="密码"  />
-    </view>
-  
-    <view class="login_b">
-      <navigator class="login_url" url="#">验证码登录</navigator>
-      <navigator class="login_url" url="#">忘记了?找回密码</navigator>
-    </view>
-    <button class="login_btn" formType="submit">登录</button>
-  </view>
-</form>

pages/my_fans/index.js

@@ -18,7 +18,7 @@ Page({
     loading: false,//是否加载中
     loadend: false,//是否加载完毕
     loadTitle: '加载更多',//提示语
-    orderStatus: 0,//订单状态
+    orderStatus: 1,//订单状态
     orderList:[],//订单数组
     page: 1,
     limit: 13,

pages/my_fans/index.wxml

@@ -2,10 +2,10 @@
 <navbar parameter='{{parameter}}'></navbar> 
 <view class='my-order'>
 	<view class='nav acea-row row-around'>
-		<view class='item {{orderStatus==0 ? "on": ""}}' data-status="0" bindtap="statusClick">
+		<view class='item {{orderStatus==1 ? "on": ""}}' data-status="1" bindtap="statusClick">
 			<view>进货下级</view>
 		</view>
-		<view class='item {{orderStatus==1 ? "on": ""}}' data-status="1" bindtap="statusClick">
+		<view class='item {{orderStatus==0 ? "on": ""}}' data-status="0" bindtap="statusClick">
 			<view>我的邀请 </view>
 		</view>
 	</view>

pages/order_details/index.wxml

@@ -114,7 +114,7 @@
    <view style='height:120rpx;'></view>
    <view class='footer acea-row row-right row-middle' wx:if="{{isGoodsReturn==false || status.type == 9}}">
       <view class='bnt bg-color' wx:if="{{status.type==0}}" data-order_id='{{orderInfo.order_id}}' bindtap='pay_open'>立即付款</view>
-      <navigator class='bnt cancel' wx:elif="{{status.type==1}}" hover-class='none' url='/pages/goods_return/index?orderId={{orderInfo.order_id}}'>申请退款</navigator>
+      <!-- <navigator class='bnt cancel' wx:elif="{{status.type==1}}" hover-class='none' url='/pages/goods_return/index?orderId={{orderInfo.order_id}}'>申请退款</navigator> -->
       <view class='bnt bg-color' wx:if="{{status.class_status==1}}" bindtap='goJoinPink'>查看拼团</view>
       <navigator class='bnt cancel' wx:if="{{orderInfo.delivery_type == 'express' && status.class_status==3 && status.type==2}}" hover-class='none' url='/pages/goods_logistics/index?orderId={{orderInfo.order_id}}'>查看物流</navigator>
       <view class='bnt bg-color' wx:if="{{status.class_status==3}}" bindtap='confirmOrder'>确认收货</view>

pages/order_receipt/index.js

@@ -16,7 +16,7 @@ Page({
     },
     show: true,
     // orderId:'wx159384742516922741',
-    orderId: 'wx159374726502329057',
+    orderId: ' ',
     cartInfo: [],//购物车产品
     orderInfo: { system_store: {} },//订单详情
     windowW: '',
@@ -85,11 +85,6 @@ Page({
     var urll = '/images/receipt_bgcolor.png'
     var orderimg = '/images/icon_receipt.png'
     var adressimg = '/images/address_icon_location.png'
-
-    // 头部背景图片
-    var urlqCord = 'http://pic.qqtn.com/up/2019-7/2019073010080912409.jpg'
-
-
     that.setData({
       bgpic: url
     })
@@ -105,11 +100,6 @@ Page({
       adressimg: adressimg
     })
     // })
-    that.getBG(urlqCord).then(function (locationData) {
-      that.setData({
-        qCord: locationData
-      })
-    })
 
 
   },
@@ -278,7 +268,7 @@ Page({
           })
         }, 1000)
       }
-    })
+    }) 
   },
 
   // 将商品分享图片保存到本地

pages/register/index.js

@@ -0,0 +1,137 @@
+
+
+import { registerVerify, phoneRegister } from '../../api/api.js';
+
+const app=getApp();
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '0',
+      'title': '注册',
+      'color': true,
+      'class': '6'
+    },
+    loading: false,
+    disabled: false,
+    active: false,
+    timetext: '获取验证码',
+    userInfo: {},
+    phone: '', //手机号
+    spread: '', //邀请码
+    
+  },
+  getPhoneValue: function (e) {
+    this.setData({
+      phone: e.detail.value
+    })
+  },
+  /**
+  * 生命周期函数--监听页面加载
+  */
+  onLoad: function (options) {
+    var spread = options.scene;
+    this.setData({
+      spread: spread
+    })
+  },
+  /**
+   * 发送验证码
+   * 
+  */
+  code: function () {
+    let that = this;
+    if (!that.data.phone) return app.Tips({ title: '请先输入手机号' });
+
+    var type = 'register';
+    registerVerify(that.data.phone, type).then(res => {
+      return app.Tips({ title: '发送成功' }, function () {
+        that.setData({ disabled: true, active: true });
+        let n = 60;
+        let run = setInterval(function () {
+          n--;
+          if (n < 0) {
+            clearInterval(run);
+            that.setData({ disabled: false, active: false, timetext: '重新获取' })
+          } else {
+            that.setData({ timetext: "剩余 " + n + "s" })
+          }
+        }, 1000);
+      });
+    }).catch(err => {
+      return app.Tips({ title: err });
+    });
+  },
+  loginSubmit: function (e) {
+
+    var that = this, data = {};
+    var datainfo = e.detail.value;
+    if (!datainfo.account) return app.Tips({ title: '请先输入手机号' });
+    if (!datainfo.password) return app.Tips({ title: '请输入密码' });
+    if (!datainfo.captcha) return app.Tips({ title: '请输入验证码' });
+    phoneRegister(datainfo).then(res => {
+      // wx.setStorageSync('token', res.data.token);
+      return app.Tips({ title: '注册成功！' }, function () {
+        wx.switchTab({ url: '/pages/index/index' });
+      });
+
+    }).catch(err => {
+      return app.Tips({ title: err });
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/register/index.wxml

@@ -0,0 +1,27 @@
+<!--pages/login/index.wxml-->
+<navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}"></navbar>
+<view class="login">
+	<image src="/images/login_logo.png" class="login_img"></image>
+</view>
+<form class='form' bindsubmit='loginSubmit'>
+	<view class="login_a">
+		<view class="login_p">注册</view>
+		<view class="inputa">
+			<input class="input" type="number" name="account" bindinput='getPhoneValue'  placeholder="手机号码" />
+		</view>
+		<view class="inputc">
+			<input class="input" type="number" name="captcha" placeholder="验证码" />
+			<!-- <button class="code_btn">获取验证码</button> -->
+			<button class="code_btn  {{disabled === true ? 'on' : ''}}" disabled='{{disabled}}' bindtap="code">
+				{{ timetext }}
+			</button>
+		</view>
+		<view class="inputb">
+			<input class="input" type="password" name="password" placeholder="密码" />
+		</view>
+		<view class="inputb">
+			<input class="input" disabled="disabled" value="{{spread}}" type="text" name="spread" placeholder="邀请码" />
+		</view>
+		<button class="login_btn" formType="submit">注册</button>
+	</view>
+</form>

pages/login/index.wxss → pages/register/index.wxss

@@ -1,4 +1,7 @@
 /* pages/login/index.wxss */
+page{
+  background-color: #fff!important;
+}
 .login{
   width: 100%;
   height: 263rpx;
@@ -61,6 +64,13 @@
   color:rgba(47,47,47,1);
   opacity:1;
 }
+.inputc{
+  width: 590rpx;
+  border-bottom: 1rpx solid rgba(233, 233, 233, 1);
+  opacity: 1;
+  height: 124rpx;  
+  position: relative;
+}
 .login_btn{
   display: block;
   margin: 0 auto;
@@ -82,7 +92,7 @@
   line-height: 30rpx;
   width:30rpx;
   height:30rpx;
-  background:rgba(0,0,0,1);
+  background:rgba(0,0,0,1); 
   color: #fff;
   font-size: 18rpx;
   border-radius: 50%;
@@ -92,4 +102,36 @@
   font-weight: 300;
   margin-top: -15rpx;
   z-index: 99999;
+}
+.code_number{
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 32rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: left;
+  color: #333333;
+}
+.inputa input{
+  /* padding-left:90rpx; */
+  box-sizing: border-box;
+}
+.code_btn{
+  display: inline-block;
+  height: 60rpx;
+  border: 2rpx solid #979797;
+  border-radius: 8rpx;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  line-height: 60rpx;
+  color: #999999;
+  font-size: 28rpx;
+  text-align: center;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 0;
+  z-index: 99999999999;
 }

pages/retrieve_password/index.js

@@ -0,0 +1,153 @@
+// pages/retrieve_password/index.js
+import { phoneRegisterReset, registerVerify } from '../../api/api.js';
+let app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cloneIner: null,
+    loading: false,
+    errorSum: 0,
+    errorNum: 3,
+    disabled: false,
+    active: false,
+    timetext: '获取验证码',
+    userInfo: {},
+    phone: '', //手机号
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '登录',
+      'color': true,
+      'class': '6'
+    },
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  getPhoneValue: function (e) {
+    this.setData({
+      phone: e.detail.value
+    })
+  },
+  /**
+ * 发送验证码
+ * 
+*/
+  code: function () {
+    let that = this;
+    if (!that.data.phone) return app.Tips({ title: '请先输入手机号' });
+
+    var type = 'reset';
+    registerVerify(that.data.phone, type).then(res => {
+      return app.Tips({ title: '发送成功' }, function () {
+        that.setData({ disabled: true, active: true });
+        let n = 60;
+        let run = setInterval(function () {
+          n--;
+          if (n < 0) {
+            clearInterval(run);
+            that.setData({ disabled: false, active: false, timetext: '重新获取' })
+          } else {
+            that.setData({ timetext: "剩余 " + n + "s" })
+          }
+        }, 1000);
+      });
+    }).catch(err => {
+      return app.Tips({ title: err });
+    });
+  },
+
+  close() {
+    let pages = getCurrentPages();
+    let currPage = pages[pages.length - 1];
+    if (this.data.isGoIndex) {
+      wx.switchTab({ url: '/pages/index/index' });
+      this.setData({
+        ihidden: true
+      });
+    } else {
+      this.setData({
+        iShidden: true,
+        ihidden: true
+      });
+      if (currPage && currPage.data.iShidden != undefined) {
+        currPage.setData({ iShidden: true, ihidden: true });
+      }
+    }
+  },
+  loginSubmit: function (e) {
+    var that = this, data = {};
+    var datainfo = e.detail.value;
+    phoneRegisterReset(datainfo).then(res => {
+      wx.setStorageSync('userid', res.data.id);
+      var userid = wx.getStorageSync('userid');
+      that.setData({
+        ihidden: false
+      })
+      return app.Tips({ title: '修改成功', icon: 'success' }, function(){
+        wx.navigateBack({ delta: 1 });
+      });
+
+      console.log(userid);
+
+    }).catch(err => {
+      return app.Tips({ title: err });
+
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/retrieve_password/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/retrieve_password/index.wxml

@@ -0,0 +1,27 @@
+<!--pages/retrieve_password/index.wxml-->
+<view class="navlogin" hidden='{{iShidden}}'>
+	<navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}"></navbar>
+	<view class="login">
+		<image src="/images/login_logo.png" class="login_img"></image>
+	</view>
+	<form class='form' bindsubmit='loginSubmit'>
+		<view class="login_a">
+			<view class="login_p">登录</view>
+			<view class="inputa">
+				<view class="code_number">+86</view>
+				<input  type='number' placeholder="请输入手机号" maxlength='11' name="account" class='input' bindinput='getPhoneValue' />
+			</view>
+			<view class="inputb">
+				<input class="input" type="number" name="captcha" placeholder="验证码" />
+				<!-- <button class="code_btn">获取验证码</button> -->
+				<button class="code_btn  {{disabled === true ? 'on' : ''}}" disabled='{{disabled}}' bindtap="code">
+					{{ timetext }}
+				</button>
+			</view>
+			<view class="inputb">
+				<input name="password" type='password' placeholder="请输入新密码"  class='input'  />
+			</view>
+			<button class="login_btn" formType="submit">确定</button>
+		</view>
+	</form>
+</view>

pages/user/user.wxml

@@ -51,7 +51,7 @@
            <view class='item' data-url='/pages/order_list/index?status=5' bindtap='goPages'>
               <view class='pictrue'>
               <image src='/images/my_icon_stock.png'></image>
-              <text class="order-status-num" wx:if="{{orderStatusNum.received_count > 0}}">{{ orderStatusNum.received_count }}</text>
+              <text class="order-status-num" wx:if="{{orderStatusNum.beihuo > 0}}">{{ orderStatusNum.beihuo }}</text>
               </view>
               <view>备货中</view>
            </view>

pages/login/index.js → pages/user_contact/index.js

@@ -1,37 +1,28 @@
-// pages/login/index.js
+// pages/user_us/index.js
+import { getStore} from '../../api/user.js';
 const app = getApp();
-import { phoneLogin } from '../../api/api.js';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    parameter:{
+    parameter: {
       'navbar': '1',
-      'return': '0',
-      'title': '登录',
-      'color': true,
-      'class': '6'
+      'return': '1',
+      'title': '联系店长',  
     },
-    input_code:'' ,
+    aboutdate:''
   },
-  click: function(){
-    this.setData({
-      input_code:''
-    })
+  onLoadFun: function () {
+    this.getAbout();
   },
-  loginSubmit:function(e){
-    var that = this, data = {};
-    var datainfo = e.detail.value;
-    phoneLogin(datainfo).then(res => {
-      wx.setStorageSync('token',res.data.token);
-      return app.Tips({ title: '登录成功', icon: 'success' }, function(){
-        wx.switchTab({url:'/pages/index/index'});
+  getAbout: function () {
+    var that = this;
+    getStore().then(res => {
+      that.setData({
+        aboutdate: res.data.system_store,
       });
-    }).catch(err => {
-      return app.Tips({ title: err });
-
     })
   },
   /**
@@ -48,7 +39,6 @@ Page({
 
   },
 
-  
   /**
    * 生命周期函数--监听页面显示
    */

pages/user_contact/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "navbar": "/components/navbar/index",
+    "authorize": "/components/authorize/authorize"
+  }
+}

pages/user_contact/index.wxml

@@ -0,0 +1,10 @@
+<!--pages/user_contact/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+<view class="us_a">
+  <view class="us">店铺名称：{{aboutdate.name}}</view>
+  <view class="us">联系电话：{{aboutdate.phone}}</view>
+  <view class="us">店铺简介：{{aboutdate.introduction}}</view>
+</view>
+
+<authorize bind:onLoadFun="onLoadFun"></authorize>
+

pages/user_contact/index.wxss

@@ -0,0 +1,14 @@
+/* pages/user_contact/index.wxss */
+page{
+  background-color: #ffffff!important;
+}
+.us_a{
+  width: 690rpx;
+  margin: 25rpx auto;
+  overflow: hidden;
+}
+.us{
+  font-size: 30rpx;
+  line-height: 65rpx;
+  color: #333;
+}

pages/user_info/index.wxml

@@ -22,20 +22,18 @@
 			</view>
 			<view class='item acea-row row-between-wrapper'>
 				<view>级别</view>
-				<view class='input'><input type='text' name='nickname' value='{{userInfo.level}}'></input></view>
+				<view class='input'><input type='text' disabled="disabled" value='{{userInfo.level}}'></input></view>
 			</view>
 			<view class='item acea-row row-between-wrapper'>
 				<view>推荐人 </view>
-				<view class='input'><input type='text' name='nickname' value='{{userInfo.spread_name.nickname}}'></input></view>
+				<view class='input'><input type='text' disabled="disabled" value='{{userInfo.spread_name.nickname}}'></input></view>
 			</view>
-
-
 		</view>
 		<view class='personal-data'>
 			<view class='list'>
 				<view class='item acea-row row-between-wrapper'>
 					<view>登录账号</view>
-					<view class='input'><input type='text' name='nickname' value='{{userInfo.phone}}'></input></view>
+					<view class='input'><input type='text' disabled="disabled" value='{{userInfo.phone}}'></input></view>
 				</view>
 				<view class="item acea-row row-between-wrapper" wx:if="{{userInfo.phone && userInfo.user_type == 'h5'}}">
 					<view>登录密码</view>

pages/user_spread_code/index.js

@@ -13,7 +13,7 @@ Page({
     parameter: {
       'navbar': '1',
       'return': '1',
-      'title': '分销海报'
+      'title': '邀请注册'
     },
     imgUrls: [],
     indicatorDots: false,

pages/user_spread_code/index.wxml

@@ -1,6 +1,6 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='distribution-posters'>
-   <swiper  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="bindchange" previous-margin="40px" next-margin="40px">
+   <swiper  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="bindchange" previous-margin="40px" next-margin="40px">  
      <block wx:for="{{spreadList}}" wx:key>
         <swiper-item>
            <image src="{{item.poster}}" class="slide-image {{swiperIndex == index ? 'active' : 'quiet'}}" mode='aspectFill'/>

pages/user_spread_money/index.wxml

@@ -29,5 +29,11 @@
           </view>
       </view>
      </block> 
+     <view class='noCart' wx:if="{{recordList.length == 0 && page > 1}}">
+			<view class='pictrue'>
+				<image src='/images/record_icon_blank.png'></image>
+				<view class="nocatr_p">暂时没有数据</view>
+			</view>
+		</view>
     </view>
 </view>

pages/user_spread_money/index.wxss

@@ -1,2 +1,26 @@
 .commission-details .promoterHeader .headerCon .money{font-size:36rpx;}
-.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}
+.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}
+.noCart {
+  margin-top: 171rpx;
+  padding-top: 0.1rpx;
+}
+
+.noCart .pictrue {
+  width: 292rpx;
+  height: 292rpx;
+  margin: 48rpx auto 56rpx auto;
+}
+
+.noCart .pictrue image {
+  width: 100%;
+  height: 100%;
+}
+
+.nocatr_p {
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  color: #999999;
+  margin-top: 64rpx;
+}

pages/wallet_detail/index.js

@@ -43,11 +43,11 @@ Page({
   onShow: function () {
     var type = this.data.type;
     if (type == 1) {
-      this.setData({ 'parameter.title': '出账总金额', name: '出账总金额', recordType: 4 });
+      this.setData({ 'parameter.title': '出账总金额', name: '出账总金额', recordType: 1 });
     } else if (type == 3) {
       this.setData({ 'parameter.title': '进账总金额', name: '进账总金额', recordType: 3 });
     }else if (type == 4) {
-      this.setData({ 'parameter.title': '累计已提现', name: '累计已提现', recordType: 0 });
+      this.setData({ 'parameter.title': '累计已提现', name: '累计已提现', recordType: 4 });
     } else {
       wx.showToast({
         title: '参数错误',

pages/wallet_detail/index.wxml

@@ -30,6 +30,12 @@
           </view>
       </view>
      </block> 
+     <view class='noCart' wx:if="{{recordList.length == 0 && page > 1}}">
+			<view class='pictrue'>
+				<image src='/images/record_icon_blank.png'></image>
+				<view class="nocatr_p">暂时没有数据</view>
+			</view>
+		</view>
     </view>
 </view>
 

pages/wallet_detail/index.wxss

@@ -1,2 +1,32 @@
-.commission-details .promoterHeader .headerCon .money{font-size:36rpx;}
-.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}
+.commission-details .promoterHeader .headerCon .money {
+  font-size: 36rpx;
+}
+
+.commission-details .promoterHeader .headerCon .money .num {
+  font-family: 'Guildford Pro';
+}
+
+.noCart {
+  margin-top: 171rpx;
+  padding-top: 0.1rpx;
+}
+
+.noCart .pictrue {
+  width: 292rpx;
+  height: 292rpx;
+  margin: 48rpx auto 56rpx auto;
+}
+
+.noCart .pictrue image {
+  width: 100%;
+  height: 100%;
+}
+
+.nocatr_p {
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  color: #999999;
+  margin-top: 64rpx;
+}

utils/util.js

@@ -116,14 +116,19 @@ const wxgetUserInfo = function()
   });
 }
 
-const checkLogin = function() 
+const checkLogin = function (token, expiresTime, isLog)
 {
-  let res = getApp().globalData.token ? true : false;
-  let res1 = getApp().globalData.isLog;
+  if (getApp()){
+    token = getApp().globalData.token;
+    expiresTime = getApp().globalData.expiresTime;
+    isLog = getApp().globalData.isLog;
+  }
+  let res = token ? true : false;
+  let res1 = isLog;
   let res2 = res && res1;
   if (res2){
     let newTime=Math.round(new Date() / 1000);
-    if (getApp().globalData.expiresTime < newTime) return false;
+    if (expiresTime < newTime) return false;
   }
   return res2;
 }
@@ -137,6 +142,8 @@ const logout = function()
 const chekWxLogin = function()
 {
   return new Promise((resolve, reject)=>{
+    if (checkLogin()) 
+      return resolve({ userinfo: getApp().globalData.userInfo, isLogin: true });
     wx.getSetting({
       success(res) {
         if (!res.authSetting['scope.userInfo']) {
@@ -145,16 +152,12 @@ const chekWxLogin = function()
           wx.getStorage({
             key: 'cache_key',
             success(res){
-              if (checkLogin()) {
-                return resolve({ userinfo: getApp().globalData.userInfo, isLogin: true });
-              } else {
-                wxgetUserInfo().then(userInfo => {
-                  userInfo.cache_key = res.data;
-                  return resolve({ userInfo: userInfo, isLogin: false });
-                }).catch(res => {
-                  return reject(res);
-                })
-              }
+              wxgetUserInfo().then(userInfo => {
+                userInfo.cache_key = res.data;
+                return resolve({ userInfo: userInfo, isLogin: false });
+              }).catch(res => {
+                return reject(res);
+              });
             },
             fail(){
               getCodeLogin((code) => {
@@ -420,9 +423,6 @@ const textByteLength = (text, num) =>{
   return [strLength, arr, rows]   //  [处理文字的总字节长度，每行显示内容的数组，行数]
 }
 
-
-
-
 /**
  * 获取分享海报
  * @param array arr2 海报素材
@@ -542,4 +542,4 @@ module.exports = {
   wxgetUserInfo: wxgetUserInfo,
   autoLogin: autoLogin,
   logout: logout
-}
+}

utils/wxh.js

@@ -1,3 +1,4 @@
+import { CACHE_LONGITUDE, CACHE_LATITUDE } from '../config.js';
 //购物车减
 var carmin = function (that){
     var num = that.data.num;
@@ -143,6 +144,83 @@ var tapsize = function(that,e){
     taberindex: $index
   })
 }
+var selfLocation = function(showMode) {
+  const that = this;
+  return new Promise((resolve, reject)=>{
+    let longitude = wx.getStorageSync(CACHE_LONGITUDE); //经度
+    let latitude = wx.getStorageSync(CACHE_LATITUDE); //纬度
+    if (longitude && latitude) {
+      return resolve({ longitude: longitude, latitude: latitude});
+    }
+    wx.getSetting({
+      success: (res) => {
+        if (!res.authSetting['scope.userLocation']) {
+          wx.removeStorageSync(CACHE_LONGITUDE);
+          wx.removeStorageSync(CACHE_LATITUDE);
+          wx.getLocation({
+            success: function (res) {
+              var latitude = res.latitude;
+              var longitude = res.longitude;
+              wx.setStorageSync(CACHE_LONGITUDE, longitude);
+              wx.setStorageSync(CACHE_LATITUDE, latitude);
+              resolve(res);
+            },
+            fail(res) {
+              if (res.errMsg == "getLocation:fail auth deny" && showMode == undefined) {
+                wx.showModal({
+                  title: '您已经拒绝授权地理位置',
+                  content: '是否需要开启权限',
+                  success: function (res) {
+                    if (res.cancel) {
+                      reject(res);
+                    } else if (res.confirm) {
+                      wx.openSetting({
+                        success: function (res) {
+                          if (res.authSetting["scope.userLocation"] == true) {
+                            wx.showToast({
+                              title: '授权成功',
+                              icon: 'success',
+                              duration: 1000
+                            })
+                            wx.getLocation({
+                              success: function (res) {
+                                var latitude = res.latitude;
+                                var longitude = res.longitude;
+                                wx.setStorageSync(CACHE_LONGITUDE, longitude);
+                                wx.setStorageSync(CACHE_LATITUDE, latitude);
+                                resolve(res);
+                              }
+                            })
+                          } else {
+                            wx.showToast({
+                              title: '授权失败',
+                              icon: 'none',
+                              duration: 1000
+                            })
+                          }
+                        }
+                      })
+                    }
+                  },
+                })
+              }
+            },
+          });
+        } else {
+          wx.getLocation({
+            success: function (res) {
+              let latitude = res.latitude;
+              let longitude = res.longitude;
+              wx.setStorageSync(CACHE_LONGITUDE, longitude);
+              wx.setStorageSync(CACHE_LATITUDE, latitude);
+              resolve(res);
+            }
+          })
+        }
+      }
+    })
+  })
+}
 module.exports = {
   carmin: carmin,
   carjia: carjia,
@@ -150,5 +228,6 @@ module.exports = {
   footan: footan,
   tapsize: tapsize,
   home: home,
-  time2: time2
+  time2: time2,
+  selfLocation: selfLocation
 }