zhengkaixin 2 年之前
父节点
当前提交
a9fe0184c3

+ 3 - 0
App.vue

@@ -1,8 +1,11 @@
 <style lang="scss">
 	/* 注意要写在第一行,同时给style标签加入lang="scss"属性 */
 	@import "@/uni_modules/uview-ui/index.scss";
+	// @import '@/assets/font/font.css';
+	
 </style>
 <script>
+	
 	import './config/.env.js'
 	import './assets/js/font.js'
 	export default {

二进制
assets/font/SourceHanSerifSC-Bold.otf


二进制
assets/font/SourceHanSerifSC-ExtraLight.otf


二进制
assets/font/SourceHanSerifSC-Heavy.otf


二进制
assets/font/SourceHanSerifSC-Light.otf


二进制
assets/font/SourceHanSerifSC-Medium.otf


二进制
assets/font/SourceHanSerifSC-Regular.otf


二进制
assets/font/SourceHanSerifSC-SemiBold.otf


+ 57 - 0
assets/font/font-a.css

@@ -0,0 +1,57 @@
+@font-face {  
+
+    font-family: 'Bold';
+
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Bold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+  @font-face {  
+
+    font-family: 'Medium';
+
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Medium.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+@font-face {  
+
+    font-family: 'SemiBold';
+
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+@font-face {  
+
+    font-family: 'Regular';
+
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Regular.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+  @font-face {
+  
+      font-family: 'Light';
+  
+      src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Light.otf');
+  
+      font-weight: normal;  
+  
+      font-style: normal;  
+  
+    }

+ 5 - 5
assets/font/font.css

@@ -2,7 +2,7 @@
 
     font-family: 'Bold';
 
-    src: url('SourceHanSerifSC-Bold.otf');
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
 
     font-weight: normal;  
 
@@ -13,8 +13,8 @@
   @font-face {  
 
     font-family: 'Medium';
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
 
-    src: url('SourceHanSerifSC-Medium.otf');
 
     font-weight: normal;  
 
@@ -26,7 +26,7 @@
 
     font-family: 'SemiBold';
 
-    src: url('SourceHanSerifSC-SemiBold.otf');
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
 
     font-weight: normal;  
 
@@ -37,7 +37,7 @@
 
     font-family: 'Regular';
 
-    src: url('SourceHanSerifSC-Regular.otf');
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
 
     font-weight: normal;  
 
@@ -48,7 +48,7 @@
   
       font-family: 'Light';
   
-      src: url('SourceHanSerifSC-Light.otf');
+    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
   
       font-weight: normal;  
   

+ 32 - 29
components/ShareServer.vue

@@ -28,6 +28,7 @@
 		created() {},
 		methods: {
 			 addPoint(){
+				 
 				 API_WeiXin.addPoint({
 					 id:this.id,
 					 pointCode:"70007"
@@ -55,8 +56,8 @@
 						nonceStr: wxconfig.nonceStr, // 必填,生成签名的随机串
 						signature: wxconfig.signature, // 必填,签名,见附录1
 						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
-						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'] ,// 必填,需要使用的JS接口列表,所有JS接口列表见附录2
-						//'checkJsApi',
+						'onMenuShareQQ', 'onMenuShareQZone'] ,// 必填,需要使用的JS接口列表,所有JS接口列表见附录2
+						//'checkJsApi',,'updateAppMessageShareData','updateTimelineShareData'
 					});
 					
 						console.log("aaa")
@@ -78,7 +79,7 @@
 			//微信分享自定义
 			wxShare() {
 				var userInfo=this.carhelp.getPersonInfo()
-				var img=require("@/assets/img/logo.png")
+				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
 				
 				var title="[微官网]"+this.title
 			//	var desc=
@@ -91,38 +92,39 @@
 				wx.ready(function() {
 					
 					
-					wx.updateTimelineShareData({
-						title: title,
-					//	desc:desc ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-					wx.updateAppMessageShareData({
-						title: title,
-					//	desc:desc ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
+					// wx.updateTimelineShareData({
+					// 	title: title,
+					// //	desc:desc ,
+					// 	link: joinUrl,
+					// 	 imgUrl: img,
+					// 	success: function() {
+					// 		if(userInfo){
+					// 			//_this.addPoint()
+					// 		}
+					// 		// 设置成功
+					// 		_this.$emit("wxShare",null);
+					// 	}
+					// })
+					// wx.updateAppMessageShareData({
+					// 	title: title,
+					// //	desc:desc ,
+					// 	link: joinUrl,
+					// 	 imgUrl: img,
+					// 	success: function() {
+					// 		if(userInfo){
+					// 			//_this.addPoint()
+					// 		}
+					// 		// 设置成功
+					// 		_this.$emit("wxShare",null);
+					// 	}
+					// })
 					wx.onMenuShareAppMessage({
 						title: title,
 					//	desc:desc ,
 						link: joinUrl,
 						 imgUrl: img,
 						success: function() {
+							console.log('111')
 							if(userInfo){
 								_this.addPoint()
 							}
@@ -136,6 +138,7 @@
 						link: joinUrl,
 						 imgUrl: img,
 						success: function() {
+								console.log('222')
 							if(userInfo){
 								_this.addPoint()
 							}

+ 0 - 1
main.js

@@ -2,7 +2,6 @@ import App from './App'
 import Vue from 'vue'
 import getOpenId from './apis/utils/init.js'
 import getALIOpenId from './apis/utils/initALI.js'
-import '@/assets/font/font.css'
 
 var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
 var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)

+ 4 - 4
pages/mine/mine.vue

@@ -44,7 +44,7 @@
 						{{plusInfo.userShare}}
 					</view>
 					<view class="text">
-						发布
+						<u>发布</u>
 					</view>
 				</view>
 				<view class="item" @click="gotoUrl('pages/mine/myLike')" >
@@ -52,7 +52,7 @@
 						{{plusInfo.userNewsLike}}
 					</view>
 					<view class="text">
-						点赞
+						<u>点赞</u>
 					</view>
 				</view>
 				<view class="item" @click="gotoUrl('pages/mine/myComment')" >
@@ -60,7 +60,7 @@
 						{{plusInfo.userNewsComment}}
 					</view>
 					<view class="text">
-						  评论
+						  <u>评论</u>
 					</view>
 				</view>
 				<view class="item"  >
@@ -69,7 +69,7 @@
 						{{plusInfo.userPoints}}
 					</view>
 					<view class="text">
-						积分
+						<u>积分</u>
 					</view>
 				</view>
 			</view>

+ 6 - 3
pages/news/articleDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar></u-navbar>
+		<u-navbar :isBack="back" ></u-navbar>
 		  <share-server ref="share"   ></share-server>
 	<!-- 新闻内容 -->
 	    <view class="content">
@@ -134,12 +134,15 @@
 				showMessage:false,
 				userInfo:null,
 				list:[],
-				 
+				 back:true,
 				recordsTotal:0,
 				
 			}
 		},
 		onLoad(op){
+			if(op.back&&op.back=="share"){
+				this.back=false
+			}
 			this.id=op.id
 			this.userInfo=this.carhelp.getPersonInfo()
 			this.getInfo(true)
@@ -274,7 +277,7 @@
 					}
 					this.info=res.data;
 					
-					this.$refs.share.setUrl("/pages/news/articleDetails?id="+this.id);
+					this.$refs.share.setUrl("/pages/news/articleDetails?back=share&id="+this.id);
 					
 					this.$refs.share.setTitle(this.info.title,this.id);
 					

+ 1 - 1
uni_modules/uview-ui/components/u-navbar/u-navbar.vue

@@ -90,7 +90,7 @@
 			// 返回的文字提示
 			backText: {
 				type: String,
-				default: '返回'
+				default: ''
 			},
 			// 返回的文字的 样式
 			backTextStyle: {