Merge branch 'dev' into feature-zyw

src/app.js

@@ -113,7 +113,7 @@ App({
     loginFirst: false,
     imageUrl:"", //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
-    brandId: 2005,
-    // brandId: 1001,
+    // brandId: 2005,
+    brandId: 1001,
   }
 })

src/app.json

@@ -23,6 +23,7 @@
   "navigateToMiniProgramAppIdList": [
     "wxeb490c6f9b154ef9",
     "wxcf6d299fecd830cf",
-    "wx5717ceb7cfa09f2e"
+    "wx5717ceb7cfa09f2e",
+    "wx358b56af62edbde1"
   ]
 }
\ No newline at end of file

src/component/table/table.wxss

@@ -3,15 +3,15 @@
   border-collapse: collapse;
   font-size: 28rpx;
   color: #333333;
-  text-align: center;
+  text-align: left;
   vertical-align: middle;
   width: 100%;
 }
 .table .tr{
   display: table-row;
-  height: 60rpx;
+  height: 70rpx;
   vertical-align: middle;
-  line-height: 60rpx;
+  line-height: 70rpx;
 }
 .table .thead{
   display: table-header-group;
@@ -27,5 +27,12 @@
 }
 .table .tr .th,.table .tr .td{
   display: table-cell;
-  /* border: 1px solid #ddd; */
 }
+.table .tr .th:first-child {
+  width: 100rpx;
+  padding: 0rpx 30rpx 0 0;
+}
+.table .tr .th:last-child {
+ padding-left: 10rpx;
+ box-sizing: border-box;
+}
\ No newline at end of file

src/config/index.js

-const PROJECT_ENV = 'pre' // 生产 prod, 测试 dev, 预生产 pre
+const PROJECT_ENV = 'dev' // 生产 prod, 测试 dev, 预生产 pre
 const needMock = '' //
 
 // appid_dev_wx   wxc3b64b09b1d3dfc2

src/pages/consumptionDetails/consumptionDetails.js

@@ -37,7 +37,7 @@ wxService.page({
     if(orderNo){
       this.initOrderDetail(orderNo)
     }
-    // this.initOrderDetail('30119060422083416189296')
+    // this.initOrderDetail('71110110025959520190610160256')
   },
 
   initOrderDetail(orderNo){

src/pages/consumptionDetails/consumptionDetails.wxml

 <!--pages/consumptionDetails.wxml-->
 <wxs src="../../wxs/utils.wxs" module="utils" />
 
-<view class="consumption">
+<view wx:if="{{!orderDetail.length}}">
+	<view class="no-speed">暂无消费</view>
+</view>
+
+<view class="consumption" wx:if="{{orderDetail.length}}">
 	<view class="consumption-top">
 		<view class="top-ract" />
 		<view class="top-order">

src/pages/consumptionDetails/consumptionDetails.wxss

@@ -5,7 +5,6 @@
  box-shadow: 0 0 10px #eee;
  padding:40rpx;
  position: relative;
- /* background-color: pink; */
 }
 .top-ract {
   width: 20rpx;
@@ -13,7 +12,7 @@
   background: rgb(5, 195, 90);
   border-radius:20rpx;
   position: absolute;
-  top: 5%;
+  top: 50rpx;
   left: 0;
 }
 .consumption-top {
@@ -34,7 +33,9 @@
   left: 35%;
 }
 .consumption-table {
-  height: 450rpx;
+  min-height: 450rpx;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
 }
 .consumption-img {
   width: 100%;
@@ -96,6 +97,9 @@
   border-bottom: 1px dashed #ccc;
   margin-bottom:60rpx;
 }
-.top-data{
-  /* padding-left: 20rpx; */
+.no-speed {
+  color: #ccc;
+  font-size: 28rpx;
+  text-align: center;
+  padding-top: 200rpx;
 }
\ No newline at end of file

src/pages/memberOfOwn/memberOfOwn.js

@@ -79,17 +79,17 @@ wxService.page({
       cardNoOnline: this.data.memberCardNo
     }
     wxService.post(`/member/find`,params).then(res => {
-        const { result, data } = res.data
-        if (result == 0) {
-          wx.hideLoading()
-          data.member.birthday = data.member.birthday.substring(0,10)
-          data.member.sex = data.member.sex == '男'? 0 : 1
-          this.setData({
-            memberInfo: data.member,
-            index: data.member.sex
-          })
-        }
-      })
+      const { result, data } = res.data
+      if (result == 0) {
+        wx.hideLoading()
+        data.member.birthday = data.member.birthday && data.member.birthday.substring(0,10)
+        data.member.sex = data.member.sex == '男'? 0 : 1
+        this.setData({
+          memberInfo: data.member,
+          index: data.member.sex
+        })
+      }
+    })
   },
   // 更新
   handelMemberUplate(params){

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -20,7 +20,18 @@
         <canvas canvas-id="barcode" />
       </view>
   </view>
-  <view class='form-info'>
+
+<!-- <view class="section">
+  <view class="section__title">普通选择器</view>
+  <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+    <view class="picker">
+      当前选择：{{array[index]}}
+    </view>
+  </picker>
+</view>-->
+
+
+ <view class='form-info'>
     <form bindsubmit="formSubmit">
       <view class='form-section'>
         <label class='form-label'>姓名</label>

src/pages/memberOfOwn/memberOfOwn.wxss

 /* pages/userCenter.wxss */
 @import './../../base/base.wxss';
+/* .own-content{
+  padding: 30rpx 50rpx 0;
+}
+.user-info{
+  position: relative;
+  width: 650rpx;
+  height: 298rpx; 
+  box-shadow: 0 0 40rpx 1rpx #ccc;
+  border-radius: 7rpx;
+  padding-top: 30rpx;
+  box-sizing:border-box;
+}
+.own-bg{
+  width: 100%;
+  height: 100%; 
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+.user-avatar{
+  width: 90rpx;
+  height: 90rpx;
+  overflow:hidden;
+  border-radius: 50%;
+  display: inline-block;
+  margin-right: 18rpx;
+  margin-left: 30rpx;
+}
+.user-name-content{
+  display: inline-block;
+}
+.user-name{
+  margin-bottom: 10rpx;
+}
+.user-id{
+  color: #FFF;
+  font-size: 24rpx;
+}
+.qr-code image{
+  width: 50rpx;
+  height: 50rpx;
+  margin-right: 31rpx;
+  margin-top:15rpx;
+}
+.user-qr-code{
+  background-color: #ffffff;
+  border-radius: 7rpx;
+  width:650rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+canvas{
+  top: 20rpx;
+  left: 70rpx;
+}  */
+
 .textarea-wrp {
   padding-left: 46rpx;
 }
@@ -39,7 +97,6 @@
   display: inline-block;
   margin-right: 18rpx;
   margin-left: 30rpx;
-  /* margin-top:-6rpx; */
 }
 .userinfo-nickname {
   font-size: 28rpx;
@@ -74,7 +131,6 @@
   height: 100rpx;
   line-height: 100rpx;
   text-align: center;
-  /* box-shadow: 0 0 10rpx 1rpx #666666; */
 }
 
 .user-qr-code image{
@@ -84,7 +140,6 @@
   margin-top: 25rpx;
 }
 
-/* form表单 */
 .form-info{
   background-color: #ffffff;
   margin-top: 60rpx;

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.6.6",
-	"appid": "wx358b56af62edbde1",
+	"appid": "wxc3b64b09b1d3dfc2",
 	"projectname": "7-Eleven",
 	"debugOptions": {
 		"hidedInDevtools": []