1

components/study/Rstudy.vue

@@ -53,7 +53,7 @@
 				this.isshow = true;
 				this.Name = this.laststudy.name;
 				this.Cover = this.laststudy.cover_pic;
-				this.progress = parseInt(this.laststudy.learned / this.laststudy.count);
+				this.progress = parseInt(this.laststudy.learned / this.laststudy.count)*100;
 			}
 		},
 		methods:{

pages/index/index.vue

@@ -322,6 +322,9 @@ export default {
             }else if (that.JumpType == 4) {
               //代付页面
               uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+that.OrderId });
+            }else if (that.JumpType == 5) {
+              //课程详情
+			  uni.navigateTo({ url: "/pages/school/courseInfo?GoodsId=" + that.GoodsId });
             }
           }, 500);
         } else {
@@ -528,6 +531,9 @@ export default {
 				}else if (that.JumpType == 4) {
 					  //代付页面
 					  uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+that.OrderId });
+				}else if (that.JumpType == 5) {
+				  //课程详情
+				  uni.navigateTo({ url: "/pages/school/courseInfo?GoodsId=" + that.GoodsId });
 				}
 				
             }, 500);
@@ -866,7 +872,11 @@ export default {
 		}else if (this.JumpType == 4) {
 		  //代付页面
 		  uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+this.OrderId });
+		}else if (this.JumpType == 5) {
+		  //课程详情
+		  uni.navigateTo({ url: "/pages/school/courseInfo?GoodsId=" + this.GoodsId });
 		}
+		
       }, 500);
     },
 	getPageType(){

pages/school/articleDetails.vue

@@ -199,6 +199,7 @@ export default {
 	width: 100%;
 	height: 100vh;
 	background: #FFF;
+	font-family: aa;
 	
 }
 .articleDetails .ad-box{

pages/school/courseContent.vue

@@ -125,7 +125,8 @@
 				},
 				cover_pic:'',
 				count:0,
-				learned:0
+				learned:0,
+				Up:0,
 			}
 		},
 		onLoad(options) {
@@ -162,6 +163,7 @@
 			uni.setNavigationBarTitle({
 			  title: this.pageTitle,
 			});
+			this.Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;//用于分享出去的参数
 		},
 		onUnload(){//监听页面卸载
 			if(this.timer) {  
@@ -191,7 +193,7 @@
 			    return {
 				   title: this.name,
 				   path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=5',
-				   imageUrl: ''
+				   imageUrl: this.cover_pic,
 			    };	
 			},
 			//图片预览和文档的打开
@@ -205,16 +207,29 @@
 						});
 					}
 				}else{
+					uni.showLoading({
+					    title: '下载中'
+					});
 					uni.downloadFile({
 					  url: this.selectcourse.FilePath,
 					  success: function (res) {
+						uni.showLoading({
+						    title: '正在打开'
+						});
 						var filePath = res.tempFilePath;
 						uni.openDocument({
 						  filePath: filePath,
 						  success: function (res) {
+							uni.hideLoading()
 							console.log('打开文档成功');
+						  },
+						  fail:function(){
+							uni.hideLoading()  
 						  }
 						});
+					  },
+					  fail:function(){
+						uni.hideLoading()
 					  }
 					});
 				}

pages/school/courseInfo.vue

@@ -386,7 +386,7 @@ export default {
     let imageUrl =
       this.g.app_share_pic != null && this.g.app_share_pic != ""
         ? this.g.app_share_pic
-        : this.g.pic_url[0].pic_url;
+        : this.g.cover_pic;
     let id = this.id;
     return {
       title: title,
@@ -408,17 +408,17 @@ export default {
 	if(SmallShopId == 0){//如果微店id为0 去找所属微店id
 		SmallShopId = u.UserSmallShopId? u.UserSmallShopId:0
 	}
+	console.log("/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=5')
     return {
       title:
         this.g.app_share_title != null && this.g.app_share_title != ""
           ? this.g.app_share_title
           : this.g.name,
-      // path: "/pages/goods/goods?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId,
       path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=5',
       imageUrl:
         this.g.app_share_pic != null && this.g.app_share_pic != ""
           ? this.g.app_share_pic
-          : this.g.pic_url[0].pic_url,
+          : this.g.cover_pic,
     };
   },
   mounted() {