dever 4 years ago
parent
commit
5552fe54ea
5 changed files with 12 additions and 9 deletions
  1. 2 2
      lib/dever/config.js
  2. 1 1
      manifest.json
  3. 2 1
      pages.json
  4. 2 1
      pages/dream/func/cate.vue
  5. 5 4
      pages/dream/index.vue

+ 2 - 2
lib/dever/config.js

@@ -14,8 +14,8 @@ const share = {
 //http request请求配置
 const request = {
 	//	服务器接口地址
-	//host: "https://he.shemic.com/",
-	host: "http://dev.shemic.com/dreamland/",
+	host: "https://he.shemic.com/",
+	//host: "http://dev.shemic.com/dreamland/",
 	
 	//	请求的参数	
 	data: {},

+ 1 - 1
manifest.json

@@ -100,7 +100,7 @@
         },
         "title" : "合小记",
         "devServer" : {
-            "https" : false,
+            "https" : true,
             "port" : ""
         },
         "domain" : "https://he.shemic.com/",

+ 2 - 1
pages.json

@@ -50,7 +50,8 @@
             		"bounce": "none",
             		"navigationStyle": "custom"
             	},
-				"onReachBottomDistance":1 //距离底部多远时触发 单位px
+				"onReachBottomDistance":1 ,//距离底部多远时触发 单位px
+				"enablePullDownRefresh" : false
             }
         },
 		{

+ 2 - 1
pages/dream/func/cate.vue

@@ -216,8 +216,9 @@ export default {
 
 									.product-img {
 										width: 120rpx;
-										height: 140rpx;
+										height: 120rpx;
 										margin-bottom: 10rpx;
+										 margin-left: -22rpx;
 									}
 
 									.product-title {

+ 5 - 4
pages/dream/index.vue

@@ -41,8 +41,8 @@
 				<!-- section-2 end -->
 				<view class="section-3">
 					<view class="my-integral">
-						<view class="tips">
-							<rich-text :nodes="fetch.info.content"></rich-text>
+						<view class="tips">
+							<mp-html :content="fetch.info.content" ref="article"></mp-html>
 						</view>
 					</view>
 					
@@ -104,6 +104,7 @@
 </template>
 
 <script>
+	import mpHtml from "@/lib/mp-html/mp-html.vue";
 	import buy from "@/pages/dream/buy.vue";
 	import ranking from "@/pages/dream/ranking.vue";
 	import info from "@/pages/dream/info.vue";
@@ -250,7 +251,7 @@
 			}
 		},
 		components:{
-			buy,ranking,info,deverShare
+			buy,ranking,info,deverShare,mpHtml
 		}
 	}
 </script>
@@ -311,7 +312,7 @@ page {
 		}
 		
 		.wenyue-font {
-			font-size: 48rpx;
+			font-size: 30rpx;
 			margin-bottom: 10rpx;
 		}	
 	}