nyx weapp: 主流程

1. 调整各页面的样式表，以便统一

nyx weapp: 主流程
1. 调整各页面的样式表，以便统一
3c5763ac · jscat · 2361549e · 3c5763ac · 3c5763ac · 3c5763ac
Commit 3c5763ac authored Aug 14, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxss
 .scroll-view_H{
@@ -51,7 +51,7 @@
 }
 .note-title{
-  font-size: 16px;
+  font-size: 30rpx;
  margin-left: 5%;
  margin-right: 5%;
  margin-top: 0;
@@ -69,7 +69,7 @@
 .note-content{
-  font-size: 16px;
+  font-size: 32rpx;
  /* 后期用于 '展开' 功能 */
  /* overflow : hidden;
@@ -79,7 +79,7 @@
  -webkit-box-orient: vertical; */
  margin-left: 5%;
  margin-right: 4%;
-  margin-top: 20rpx;
+  /* margin-top: 20rpx; */
  text-align:justify;
 }
 .note-row{
@@ -97,7 +97,7 @@
 .writer-image{
  width: 120rpx;
  height: 120rpx;
-  margin-left: 10%;
+  margin-left: 5%;
 }
 /* start bottom style */
@@ -134,7 +134,7 @@
 button {
  color: white;
  text-align: center;
-  font-size: 40rpx;
+  font-size:36rpx;
  height: 2.6em;
  line-height: 2.6em;
 }
@@ -163,8 +163,8 @@
  align-items: center;
 }
 .items image{
-  width: 80rpx;
+  width: 60rpx;
-  height: 80rpx;
+  height: 60rpx;
  margin-top: 20rpx;
  font-size: 0;
 }

--- a/增值产品-小程序及app/nyx-master/pages/activity/activity.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity.wxss
 /*
@@ -29,7 +29,7 @@
  display: inline;
  margin: 15rpx 22rpx;
  text-align: center;
-  font-size: 16px;
+  font-size: 32rpx;
  color: #9d9d9d;
 }
 .navBar-box .cate-list.on {
@@ -58,7 +58,7 @@
 }
 .note-info{
-  font-size: 17px;
+  font-size: 34rpx;
 }
 /*item title*/
@@ -76,25 +76,23 @@
  height: 170px;
  border-radius: 5px;
 }
-.note-handle, .writer{
+.note-handle{
  display: flex;
  flex-direction: row;
 }
 .name{
  margin-left: 0px;
-  margin-right : 40rpx;
-  text-align: center;
  line-height: 38px;
-  font-size: 28rpx;
+  font-size: 30rpx;
+  flex: 1;
 }
 .price{
  margin-left: 0px;
-  margin-right : 40rpx;
-  text-align: center;
  line-height: 38px;
-  font-size: 28rpx;
+  font-size: 32rpx;
  color: #FF6600;
  font-weight: bold;
+  flex : 1;
 }
 .writer image{
  width: 30px;
@@ -111,7 +109,7 @@
  margin: auto;
 }
 .like span{
-  font-size: 15px;
+  font-size: 30rpx;
  color: #9f9f9f;
  margin: auto;
 } 
@@ -205,7 +203,7 @@
  width: 65%;
  margin: 1.5em auto;
  line-height: 1.6em;
-  font-size: 14px;
+  font-size: 28rpx;
  text-align: center;
 }
 .weui-loadmore__tips {
@@ -225,7 +223,7 @@
 /* start of workbench*/
 .workbench{
-  font-size: 30rpx;
+  font-size: 32rpx;
  background: #fff;
  padding-bottom: 10rpx;
  margin-bottom:10rpx;
@@ -234,7 +232,7 @@
  color: #333;
 }
 .workbench .title{
-  font-size: 35rpx;
+  font-size: 34rpx;
  padding: 20rpx 20rpx;
  margin-bottom: 40rpx;
  display: block;

--- a/增值产品-小程序及app/nyx-master/pages/activity/quiz-info/quiz-info.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/activity/quiz-info/quiz-info.wxss
 .scroll-view_H{
@@ -51,7 +51,7 @@
 }
 .note-title{
-  font-size: 16px;
+  font-size: 32rpx;
  /* 后期用于 '展开' 功能 */
  /* overflow : hidden;
@@ -94,7 +94,7 @@
 .writer-image{
  width: 120rpx;
  height: 120rpx;
-  margin-left: 10%;
+  margin-left: 5%;
 }
 /* start bottom style */

--- a/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.wxml
 <wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
@@ -17,7 +17,7 @@
              <view class="t3 justify align">
                <view class="t3-left">{{tutil.formatDate_ymdw_today(nowDate)}}</view>
                <view class="t3-right" bindtap="onClickPoints">
-                  <view style="line-height:1; font-size:14px">{{userInfo.nickName}}</view>
+                  <view style="line-height:1;">{{userInfo.nickName}}</view>
                </view>
              </view>                        
            </view>

--- a/增值产品-小程序及app/nyx-master/pages/key/matchTest/matchTest.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/key/matchTest/matchTest.wxml
 <!--pages/key/matchTest/matchTest.wxml-->
@@ -49,7 +49,7 @@
    <view hidden="{{isStudyDone}}"> <!-- start of isStudyDone flag -->
    <view class="page__hd">
        <!-- 标题 -->
-        <view class="page__desc">{{quizInfo.questionName}}</view>
+        <view class="page__desc question-name">{{quizInfo.questionName}}</view>
    </view>
    <view class="page__bd "  wx:for-items="{{quizInfo.choiceString}}" >

--- a/增值产品-小程序及app/nyx-master/pages/key/matchTest/matchTest.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/key/matchTest/matchTest.wxss
 page{background-color:#EDEDED;}
@@ -6,7 +6,7 @@ page{background-color:#EDEDED;}
    padding-left: 100rpx;    
    text-align:left;
    line-height: 60rpx; /*缩小行间距 */
-    font-size: 40rpx;
+    font-size: 36rpx;
 }
 .mini-btn{
    margin: 0 4px;
@@ -60,7 +60,7 @@ page{background-color:#EDEDED;}
  color: #ff0000;
 }
+/* 题目分数行 */
 .placeholder{
    margin: 5px;
    padding: 0 10px;
@@ -68,7 +68,13 @@ page{background-color:#EDEDED;}
    background-color: #F7F7F7;
    height: 2.3em;
    line-height: 2.3em;
-    color: rgba(0,0,0,.3);
+    font-size: 36rpx;
+    /* color: rgba(0,0,0,.3); */
+}
+/* 题目行 */
+.question-name{
+  font-size: 36rpx;
 }
 .placeholder-button{
@@ -79,7 +85,7 @@ page{background-color:#EDEDED;}
    height: 2.3em;
    line-height: 2.3em;
    color: rgba(198, 133, 36);
-    font-size: 35rpx;
+    font-size: 34rpx;
    font-weight: bold;
 }

--- a/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
 // pages/schedule/schedule.js
@@ -34,7 +34,7 @@ Page({
    }
    wx.setNavigationBarTitle({
-      title: '活动日程',
+      title: '活动日历',
    });
  },
@@ -168,7 +168,7 @@ Page({
          year: 2020,
          month: 8,
          day: 1,
-          todoText: '埃特纳红葡',
+          todoText: '埃特纳红葡会',
          color: '#f40' // 单独定义代办颜色 (标记点、文字)
        },        
        {

--- a/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxml
 <view class="page"> 
@@ -33,8 +33,13 @@
          <view class="note-row">
              <image class="writer-image" src="{{item.product_image}}"/>
              <view class="note-column">
-                <span>{{sub_item.product_desc}} {{sub_item.unit_price}}</span>
+                <span>{{sub_item.product_desc}}</span>
-                <span> x {{sub_item.quantity}}</span>
+                <span>
+                  <view class="price-row">
+                    <view class="sub-price">{{sub_item.unit_price}}</view>
+                    <view class="sub-quantity"> x{{sub_item.quantity}}</view>
+                  </view>
+                </span>
              </view>
          </view>
        </block>

--- a/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxss
 .page{
@@ -246,7 +246,6 @@
  }
  .note-title{
-    width : 100%;
    display: flex;
    font-size: 32rpx;
    margin-left: 5%;
@@ -256,8 +255,8 @@
    vertical-align: center;
  }
-  .note-title .title-left{width: 60%; }
+  .note-title .title-left{width: 520rpx; flex:1}
-  .note-title .title-right{width: 40%;}
+  .note-title .title-right{width: 160rpx;justify-content: flex-end;display: flex;}
  .note-title .title-right image{
    width: 60rpx;
    height: 60rpx;
@@ -298,10 +297,32 @@
    display: flex;
    flex-direction: column;
    margin-left: 30rpx;
+    margin-right: 5%;
+    width: 540rpx;
  }
  .writer-image{
    width: 120rpx;
    height: 120rpx;
-    margin-left: 10%;
+    margin-left: 5%;
  }
\ No newline at end of file
+  .price-row{
+    display: flex;
+    flex-direction: row;
+  }
+  .sub-price{
+    color: #FF6600;
+    font-size: 16px;
+    margin-right: 5%;
+    margin-top: 0;
+    text-align:justify;
+    flex: 1;
+  }
+  .sub-quantity{
+    display: flex;
+    font-size: 16px;
+    justify-content: flex-end;
+  }  
\ No newline at end of file
--- a/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.js
 // pages/my/rank/rank.js
@@ -64,10 +64,9 @@ Page({
    //初始载入四个积分
    if(_this.__data__.points.length == 0)
    {
-      //getPoints(scrollType, pageNum, pageCount, matchStatus)
      //onLoad的时候展示可使用的积分
      var matchStatus = "01"
-      _this.getPoints(0, 1, 4, matchStatus);
+      _this.getPoints(0, 1, 6, matchStatus);
    }    
  },
@@ -123,7 +122,7 @@ Page({
      console.log('加载更多')
      setTimeout(() => {
-        _this.getPoints(1, pageIndex, 4, matchStatus);
+        _this.getPoints(1, pageIndex, 6, matchStatus);
      }, 1000)
    }
    else {
@@ -192,7 +191,7 @@ Page({
    _this.setData({
      matchStatus : matchStatus,
  })    
-    _this.getPoints(0, 1, 4, matchStatus)
+    _this.getPoints(0, 1, 6, matchStatus)
  },
  /**

--- a/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.wxss
 .page{
@@ -31,16 +31,23 @@
 /* coupon css */
 .coupon-list{width: 710rpx; margin:  0 auto}
-.coupon-list .item{width: 710rpx; height: 340rpx; margin-bottom: 20rpx;}
+.coupon-list .item{width: 710rpx; height: 260rpx; margin-bottom: 20rpx;}
 .coupon-list .item .float-li{width: 710rpx; height: 100%; border-right: 2rpx dashed rgba(255,255,255,.3)}
 .coupon-list .item .float-li-right{width: 220rpx; padding-right: 20rpx; height:100%; color: #fff}
 .coupon-left{position: relative}
 .coupon-left .t{position: absolute; color: #fff}
-.coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 160rpx; color: #fff}
+.coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 80rpx; color: #fff; align-items: center;}
-.coupon-left .t1-left{width: 160rpx; font-size: 70rpx; font-weight: bold}
+.coupon-left .t1-left{width: 160rpx; font-size: 60rpx; font-weight: bold}
-.coupon-left .t1-right{width: 520rpx; font-size: 50rpx; }
+.coupon-left .t1-right{
+    width: 520rpx; 
+    font-size: 40rpx; 
+    /* 单行文本 溢出 显示省略号 */
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
 /* .coupon-left .t2{left: 20rpx; top:160rpx} */
 .coupon-left .t2{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}

--- a/增值产品-小程序及app/nyx-master/utils/date.wxs
+++ b/增值产品-小程序及app/nyx-master/utils/date.wxs
 var formatTime = function (date) {
@@ -56,7 +56,7 @@ var toFix = function (value) {
 //jscat 2020/03/03 将数字1234转为ABCD
 var formatAnswer = function (n) {
  answer = ""
-  n = n.toString()
+  n = n + ""
  switch (n) {
    case "1":
      answer = "A"