feat: 修改学术传承分类

修改manifest.json版本号至1.0.59
在VIP购买提示中增加论坛不包含说明
调整开发环境API配置
优化mine页面flex布局和vip类型显示
重构medicaldes页面网格布局，支持3列/4列切换

config/baseUrl.js

@@ -2,8 +2,8 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11	
 	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川

manifest.json

@@ -13,8 +13,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.58",
+    "versionName" : "1.0.59",
-    "versionCode" : 1058,
+    "versionCode" : 1059,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {

pages/curriculum/order/curriculum/index.vue

@@ -750,7 +750,7 @@ export default {
             });
 
             const joinedText = this.textList.join("/");
-            this.goBuyTitle = "购买" + joinedText + "VIP，即可畅享更多专属权益";
+            this.goBuyTitle = "购买" + joinedText + "VIP，即可畅享更多专属权益(不包含论坛)";
           }
         });
     },

pages/medicaldes/medicaldes.vue

@@ -39,19 +39,22 @@
       <!-- </scroll-view> -->
       <template v-if="!showSearchList">
         <view class="grid twoCateList" v-if="twoCateList.length > 0">
-          <u-grid :col="3" border class="u-grid-list cateList">
+          <view
-            <u-grid-item
+            class="custom-grid"
+            :class="curOneCateIndex == 1 ? 'col-4' : 'col-3'"
+          >
+            <view
               v-for="(item, index) in twoCateList"
               :key="item.dictType"
+              class="grid-item"
               @click="setTwoCateIndex(item, index)"
             >
-              <!-- <u-button :type="success">成功按钮</u-button> -->
               <view
                 :class="['grid-text', curTwoCateIndex == index ? 'cur' : '']"
                 >{{ item.dictValue }}
               </view>
-            </u-grid-item>
+            </view>
-          </u-grid>
+          </view>
         </view>
 
         <view
@@ -199,7 +202,6 @@
 			</view>
 		</u-modal> -->
 
-    <z-navigation></z-navigation>
   </view>
 </template>
 
@@ -773,6 +775,37 @@ export default {
   // height: 40rpx;
 }
 
+.custom-grid {
+  display: flex;
+  flex-wrap: wrap;
+  // border: 1px solid #dadbde;
+	// border-bottom: 0;
+
+  &.col-3 {
+    .grid-item {
+      min-width: 33.33%;
+      flex: 1;
+    }
+  }
+
+  &.col-4 {
+    .grid-item {
+      min-width: 25%;
+      flex: 1;
+    }
+  }
+
+  .grid-item {
+    // border-right: 1px solid #dadbde;
+    // border-bottom: 1px solid #dadbde;
+    padding: 10rpx 0;
+    text-align: center;
+    font-size: 30rpx;
+    cursor: pointer;
+    box-sizing: border-box;
+  }
+}
+
 .searchList {
   .item {
     font-size: 28rpx;
@@ -799,20 +832,20 @@ export default {
       text-align: center;
       display: inline-block;
       width: 32%;
-      padding: 20rpx 0;
+      padding: 16rpx 0;
       font-size: 34rpx;
       border-radius: 10rpx;
     }
 
     .cur {
-      background-color: #3ab3ae;
+      background-color: #3AB3AE;
       color: #fff;
       box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     }
   }
 
   .twoCateList {
-    font-size: 28rpx;
+    font-size: 30rpx;
     margin-top: 20rpx;
 
     .grid-text {

pages/mine/mine/index.vue

@@ -835,6 +835,10 @@ export default {
 			margin-right: 10rpx;
 		}
   }
+
+  .userInfoBox {
+    flex: 1;
+  }
 }
 
 .now_vip {
@@ -1466,6 +1470,7 @@ export default {
 .vip_type {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
 }
 .vip_type_item {
   display: flex;
@@ -1480,6 +1485,7 @@ export default {
   font-weight: bold;
   color: #fff;
   margin-right: 8rpx;
+	margin-bottom: 4rpx;
 }
 .vip_type_item_len {
   padding: 0 7rpx;