chengjie 6 年之前
父节点
当前提交
93724a1712

+ 1 - 0
pages/main/add.wxss

@@ -55,6 +55,7 @@
55
   height:auto;
55
   height:auto;
56
   background-color: #fff;
56
   background-color: #fff;
57
   align-items: flex-start;
57
   align-items: flex-start;
58
+  font-weight: 400;
58
 }
59
 }
59
 
60
 
60
 .panelItem0 {
61
 .panelItem0 {

+ 1 - 0
pages/main/addItem.wxss

@@ -128,6 +128,7 @@
128
   margin-top: 20rpx;
128
   margin-top: 20rpx;
129
   background-color: #fff;
129
   background-color: #fff;
130
   font-size: 36rpx;
130
   font-size: 36rpx;
131
+  font-weight: 400;
131
 }
132
 }
132
 
133
 
133
 .input {
134
 .input {

+ 1 - 2
pages/main/default.wxss

@@ -43,12 +43,11 @@
43
 }
43
 }
44
 .panelBottom1 {
44
 .panelBottom1 {
45
   width: 100%;
45
   width: 100%;
46
-  background-color: #E0E0E0;
46
+  background-color: #fff;
47
 }
47
 }
48
 
48
 
49
 .panelBottom11 {
49
 .panelBottom11 {
50
   flex:1;
50
   flex:1;
51
-  background-color: #fff;
52
   font-size:20rpx;
51
   font-size:20rpx;
53
   color:#787878;
52
   color:#787878;
54
   height:98rpx;
53
   height:98rpx;

+ 0 - 1
pages/main/detail.wxml

@@ -24,7 +24,6 @@
24
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
24
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
25
     </view>
25
     </view>
26
   </view>
26
   </view>
27
-  <view class="panelTop0"></view>
28
 
27
 
29
   <!-- 练习页 -->
28
   <!-- 练习页 -->
30
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
29
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">

+ 0 - 12
pages/main/detail.wxss

@@ -17,18 +17,6 @@
17
   justify-content: space-between;
17
   justify-content: space-between;
18
 }
18
 }
19
 
19
 
20
-.panelTop0 {
21
-  width: 100%;
22
-  height: 30rpx;
23
-  position: fixed;
24
-  top: 110rpx;
25
-  z-index: 10;
26
-  background:-webkit-linear-gradient(#a5656e,rgba(165,101,110,0));
27
-  background:-o-linear-gradient(#a5656e,rgba(165,101,110,0));
28
-  background:-moz-linear-gradient(#a5656e,rgba(165,101,110,0));
29
-  background:linear-gradient(#a5656e,rgba(165,101,110,0));
30
-}
31
-
32
 .panelCancel {
20
 .panelCancel {
33
   width: 100rpx;
21
   width: 100rpx;
34
   height: 110rpx;
22
   height: 110rpx;

+ 4 - 0
pages/main/searchCard.js

@@ -29,6 +29,9 @@ Page({
29
     })
29
     })
30
   },
30
   },
31
   getList: function (e) {
31
   getList: function (e) {
32
+    wx.showLoading({
33
+      title: '请稍候',
34
+    });
32
     var IsToday=e.currentTarget.dataset.id;
35
     var IsToday=e.currentTarget.dataset.id;
33
     var that = this;
36
     var that = this;
34
     var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
37
     var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
@@ -36,6 +39,7 @@ Page({
36
       url += "&IsToday=" + IsToday;
39
       url += "&IsToday=" + IsToday;
37
 
40
 
38
     main.getData(url, function (data) {
41
     main.getData(url, function (data) {
42
+      wx.hideLoading();
39
       if (data) {
43
       if (data) {
40
         wx.setStorageSync("CardList", data);
44
         wx.setStorageSync("CardList", data);
41
         wx.navigateTo({
45
         wx.navigateTo({

+ 1 - 2
pages/main/searchCard.wxss

@@ -59,12 +59,11 @@
59
 }
59
 }
60
 .panelBottom1 {
60
 .panelBottom1 {
61
   width: 100%;
61
   width: 100%;
62
-  background-color: #E0E0E0;
62
+  background-color: #fff;
63
 }
63
 }
64
 
64
 
65
 .panelBottom11 {
65
 .panelBottom11 {
66
   flex:1;
66
   flex:1;
67
-  background-color: #fff;
68
   font-size:20rpx;
67
   font-size:20rpx;
69
   color:#787878;
68
   color:#787878;
70
   height:98rpx;
69
   height:98rpx;

+ 1 - 1
project.config.json

@@ -14,7 +14,7 @@
14
 	"compileType": "miniprogram",
14
 	"compileType": "miniprogram",
15
 	"libVersion": "2.6.4",
15
 	"libVersion": "2.6.4",
16
 	"appid": "wx84b3feac6069eec3",
16
 	"appid": "wx84b3feac6069eec3",
17
-	"projectname": "%E7%A7%92%E8%BF%87",
17
+	"projectname": "miaoguo_master",
18
 	"debugOptions": {
18
 	"debugOptions": {
19
 		"hidedInDevtools": []
19
 		"hidedInDevtools": []
20
 	},
20
 	},