Merge branch 'master' of http://115.29.66.169:10080/qingyunhui/app

app.js

@@ -8,8 +8,8 @@ App({
    * 全局变量
    */
   // apiRoot: "https://wj.songlanyun.com/wjxy/api/", // 正式环境api地址
-  // apiRoot: 'http://192.168.0.78:8687/qyh/api/',
-  apiRoot: 'http://192.168.0.193:8687/qyh/api/',
+  apiRoot: 'http://192.168.0.181:8687/qyh/api/',
+  // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志
   // apiRoot: 'http://192.168.0.186:8687/wjxy/api/',
   siteInfo: require("siteinfo.js"),

pages/home/index/partDetail/partDetail.wxss

@@ -219,7 +219,7 @@ page {
   text-indent: 40rpx;
 }
 .mainbg {
-  width: 358rpx;
+  /* width: 358rpx; */
   background: #2b58a5;
 }
 .mainbg .text-bao {

pages/my/myCollection/myCollection.wxml

@@ -53,16 +53,21 @@
 			<view class="txt-con txt-con-fix">
 				<view class="title">{{item.activity.title}}</view>
 				<view class="item">
-					<image mode="widthFix" src="{{appAssetsUrl}}/images/date-icon.png" style="width: 22rpx;" />
-					<text style="font-size: 26rpx;">时间：{{item.activity.startTime}}-{{item.activity.endTime}}</text>
+					<image mode="widthFix" src="/assets/images/online/icon_1.png" style="width: 22rpx;" />
+					<text style="font-size: 22rpx;">时间：{{item.activity.startTime}}-{{item.activity.endTime}}</text>
 				</view>
 				<view class="item">
-					<image mode="widthFix" src="{{appAssetsUrl}}/images/location-icon.png" />
-					<text>{{item.activity.address}}</text>
+					<image mode="widthFix" src="/assets/images/online/icon_2.png" />
+					<text>地址：{{item.activity.address}}</text>
 				</view>
 				<view class="item">
+					<image mode="widthFix" src="/assets/images/online/icon_3.png" />
 					<text>名额：</text>
-					<text class="red">200人</text>
+					<text>200人</text>
+				</view>
+				<view class="tag">
+					<image mode="widthFix" src="/assets/images/online/icon_4.png" />
+					<text>会员免费</text>
 				</view>
 			</view>
 		</view>

pages/my/myCollection/myCollection.wxss

@@ -480,9 +480,11 @@ white-space: nowrap;
   position: relative;
   border-radius: 20rpx;
 }
-
+.icon-dizhi{
+  font-size: 26rpx !important;
+}
 .categoryitem .label {
-	font-size: 26rpx;
+	font-size: 24rpx;
 	font-weight: 400;
 	color: #EC931A;
 	margin-right: 10rpx;
@@ -565,7 +567,7 @@ white-space: nowrap;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	width: 440rpx;
-	font-size: 28rpx;
+	font-size: 24rpx;
 	font-weight: 400;
 	text-align: left;
 	color: #999999;
@@ -590,7 +592,7 @@ white-space: nowrap;
 	padding: 0 24rpx;
 	line-height: 50rpx;
 	color: white;
-	font-size: 28rpx;
+	font-size: 24rpx;
 	width: fit-content;
 	display: inline-block;
 }
@@ -608,7 +610,6 @@ white-space: nowrap;
   position: relative;
   text-align:center;
   width: 100%;
-  height: 240rpx;
   opacity: 1;
   background: #ffffff;
   border-radius: 20rpx;
@@ -620,7 +621,27 @@ white-space: nowrap;
 .boxmfix{
   margin-bottom: 15rpx;
 }
-
+.tag{
+  width: 166rpx;
+height: 46rpx;
+background: #fffaf3;
+border: 1rpx solid #f8d6a9;
+border-radius: 10rpx;
+font-size: 22rpx;
+color: #E88600;
+display: flex;
+justify-content: center;
+align-items: center;
+}
+.tag image{
+  width: 24rpx;
+  height: 24rpx;
+  vertical-align: middle;
+  margin-right: 6rpx;
+}
+.tag text{
+  vertical-align: middle;
+}
 .img-view>image {
 position: relative;
 border-radius: 10rpx;
@@ -811,7 +832,7 @@ page{
   border-radius: 16rpx 16rpx 16rpx 0px;
 }
 .txt-con .item{
-	font-size: 28rpx;
+	font-size: 22rpx;
 	line-height:36rpx;
 	font-weight: 400;
 	color: #999999;
@@ -819,7 +840,7 @@ page{
 	overflow: hidden;
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 1;
-	margin-bottom: 5rpx;
+	/* margin-bottom: 5rpx; */
 }
 .txt-con .item .red{
 	color: #FF0000;

project.private.config.json

@@ -2,12 +2,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "/msg/pages/index/index",
+          "pathName": "/msg/pages/index/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/home/index/activityDetail/activityDetail",
           "pathName": "pages/home/index/activityDetail/activityDetail",
           "query": "id=96",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/my/myCollection/myCollection",