no message

components/page-component/app-my-service/app-my-service.vue

@@ -59,6 +59,13 @@
                 return '';
             },
         },
+		methods:{
+			gotolianjie(){
+				uni.navigateTo({
+					url:"/plugins/flash_sale/index/index"
+				})
+			}
+		}
     }
 </script>
 

components/page-component/app-product-list/app-product-list.vue

@@ -53,7 +53,7 @@
 									 class="goods-cart"
 									 src="/static/image/icon/goods-cart.png"> -->
 								<!-- #endif -->
-								立即报名
+								立即付款
 							</div>
 						</template>
 					</view>

pages.json

@@ -1,591 +1,569 @@
 {
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "首页",
-		"navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/cart/cart",
-      "style": {
-        "navigationBarTitleText": "购物车"
-      }
-    },
-    {
-      "path": "pages/article/article-list/article-list",
-      "style": {
-        "navigationBarTitleText": "文章中心"
-      }
-    },
-    {
-      "path": "pages/article/article-detail/article-detail",
-      "style": {
-        "navigationBarTitleText": "文章详情"
-      }
-    },
-    {
-      "path": "pages/binding/binding",
-      "style": {
-        "navigationBarTitleText": "绑定手机号"
-      }
-    },
-    {
-      "path": "pages/store/store",
-      "style": {
-        "navigationBarTitleText": "门店列表"
-      }
-    },
-    {
-      "path": "pages/store/detail",
-      "style": {
-        "navigationBarTitleText": "店铺详情"
-      }
-    },
-    {
-      "path": "pages/search/search",
-      "style": {
-        "navigationBarTitleText": "搜索页"
-      }
-    },
-    {
-      "path": "pages/video/video",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    
-    {
-      "path": "pages/comments/comments",
-      "style": {
-        "navigationBarTitleText": "全部评价"
-      }
-    },
-    {
-      "path": "pages/disabled/disabled",
-      "style": {
-        "navigationBarTitleText": "商城禁用"
-      }
-    },
-    {
-      "path": "pages/template/template",
-      "style": {
-        "navigationBarTitleText": "模板消息测试"
-      }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "navigateToMiniProgramAppIdList": [
-    "wx3efb95b9c5579418"
-  ],
-  "subPackages": [
-    {
-      "root": "pages/foot",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "我的足迹"
-          }
-        },
-        {
-          "path": "summary/summary",
-          "style": {
-            "navigationBarTitleText": "账单总结"
-          }
-        },
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationStyle": "custom"
+			}
+		},
 		{
-		  "path": "web/web",
-		  "style": {
-		    "navigationBarTitleText": "网页"
-		  }
-		}
-      ]
-    },
-    {
-      "root": "pages/coupon",
-      "pages": [
-        {
-          "path": "list/list",
-          "style": {
-            "navigationBarTitleText": "领券中心"
-          }
-        },
-        {
-          "path": "details/details",
-          "style": {
-            "navigationBarTitleText": "优惠券详情"
-          }
-        },
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "我的优惠券"
-          }
-        }
-      ]
-    },
-	{
-		"root":"pages/favorite",
-		"pages":[
-			{
-				"path":"favorite",
-				"style":{
-					"navigationBarTitleText":"我的收藏"
-				}
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车"
+			}
+		},
+		{
+			"path": "pages/article/article-list/article-list",
+			"style": {
+				"navigationBarTitleText": "文章中心"
+			}
+		},
+		{
+			"path": "pages/article/article-detail/article-detail",
+			"style": {
+				"navigationBarTitleText": "文章详情"
+			}
+		},
+		{
+			"path": "pages/binding/binding",
+			"style": {
+				"navigationBarTitleText": "绑定手机号"
+			}
+		},
+		{
+			"path": "pages/store/store",
+			"style": {
+				"navigationBarTitleText": "门店列表"
+			}
+		},
+		{
+			"path": "pages/store/detail",
+			"style": {
+				"navigationBarTitleText": "店铺详情"
+			}
+		},
+		{
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": "搜索页"
 			}
-		]
+		},
+		{
+			"path": "pages/video/video",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
+		{
+			"path": "pages/comments/comments",
+			"style": {
+				"navigationBarTitleText": "全部评价"
+			}
+		},
+		{
+			"path": "pages/disabled/disabled",
+			"style": {
+				"navigationBarTitleText": "商城禁用"
+			}
+		},
+		{
+			"path": "pages/template/template",
+			"style": {
+				"navigationBarTitleText": "模板消息测试"
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
 	},
-    {
-      "root": "pages/cats",
-      "pages": [
-        {
-          "path": "cats",
-          "style": {
-            "navigationBarTitleText": "分类"
+	"navigateToMiniProgramAppIdList": [
+		"wx3efb95b9c5579418"
+	],
+	"subPackages": [{
+			"root": "pages/foot",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "我的足迹"
+					}
+				},
+				{
+					"path": "summary/summary",
+					"style": {
+						"navigationBarTitleText": "账单总结"
+					}
+				},
+				{
+					"path": "web/web",
+					"style": {
+						"navigationBarTitleText": "网页"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [{
+					"path": "list/list",
+					"style": {
+						"navigationBarTitleText": "领券中心"
+					}
+				},
+				{
+					"path": "details/details",
+					"style": {
+						"navigationBarTitleText": "优惠券详情"
+					}
+				},
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "我的优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/favorite",
+			"pages": [{
+				"path": "favorite",
+				"style": {
+					"navigationBarTitleText": "我的收藏"
+				}
+			}]
+		},
+		{
+			"root": "pages/cats",
+			"pages": [{
+				"path": "cats",
+				"style": {
+					"navigationBarTitleText": "分类"
 
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/card",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "我的卡券"
-          }
-        },
-        {
-          "path": "details/details",
-          "style": {
-            "navigationBarTitleText": "卡券详情"
-          }
-        },
-        {
-          "path": "clerk/clerk",
-          "style": {
-            "navigationBarTitleText": "核销卡券"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/balance",
-      "pages": [
-        {
-          "path": "recharge",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "balance",
-          "style": {
-            "navigationBarTitleText": "余额记录"
-          }
-        },
-        {
-          "path": "rules",
-          "style": {
-            "navigationBarTitleText": "余额说明"
-          }
-        },
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "余额说明"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/topic",
-      "pages": [
-        {
-          "path": "list",
-          "style": {
-            "navigationBarTitleText": "专题列表"
-          }
-        },
-        {
-          "path": "topic",
-          "style": {
-            "navigationBarTitleText": "专题详情"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/goods",
-      "pages": [
-        {
-          "path": "list",
-          "style": {
-            "navigationBarTitleText": "商品列表"
-          }
-        },
-        {
-          "path": "goods",
-          "style": {
-            "navigationBarTitleText": "商品详情"
-          }
-        },
-        {
-          "path": "video",
-          "style": {
-            "navigationBarTitleText": "商品",
-            "disableScroll": true,
-            "app-plus": {
-              "bounce": "none"
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/member",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "会员中心"
-          }
-        },
-        {
-          "path": "rules/rules",
-          "style": {
-            "navigationBarTitleText": "会员中心"
-          }
-        },
-        {
-          "path": "upgrade/upgrade",
-          "style": {
-            "navigationBarTitleText": "升级会员"
-          }
-        },
-        {
-          "path": "detail/detail",
-          "style": {
-            "navigationBarTitleText": "会员特权说明"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/user-center",
-      "pages": [
-        {
-          "path": "user-center",
-          "style": {
-            "navigationBarTitleText": "中心"
-          }
-        },
-        {
-          "path": "integral-detail/integral-detail",
-          "style": {
-            "navigationBarTitleText": "积分明细"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/address",
-      "pages": [
-        {
-          "path": "address", 
-          "style": {
-            "navigationBarTitleText": "报名信息"
-          }
-        },
-        {
-          "path": "address-edit",
-          "style": {
-            "navigationBarTitleText": "编辑地址"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/share",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "分销中心"
-          }
-        },
-        {
-          "path": "add/add",
-          "style": {
-            "navigationBarTitleText": "分销商申请"
-          }
-        },
-        {
-          "path": "cash/cash",
-          "style": {
-            "navigationBarTitleText": "申请提现"
-          }
-        },
-        {
-          "path": "money/money",
-          "style": {
-            "navigationBarTitleText": "分销佣金"
-          }
-        },
-        {
-          "path": "order/order",
-          "style": {
-            "navigationBarTitleText": "分销订单"
-          }
-        },
-        {
-          "path": "cash-detail/cash-detail",
-          "style": {
-            "navigationBarTitleText": "提现明细"
-          }
-        },
-        {
-          "path": "team/team",
-          "style": {
-            "navigationBarTitleText": "我的团队"
-          }
-        },
-        {
-          "path": "qrcode/qrcode",
-          "style": {
-            "navigationBarTitleText": "推广二维码"
-          }
-        },
-        {
-          "path": "level/level",
-          "style": {
-            "navigationBarTitleText": "升级条件"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/order-submit",
-      "pages": [
-        {
-          "path": "order-submit",
-          "style": {
-            "navigationBarTitleText": "结算"
-          }
-        },
-        {
-          "path": "address-pick",
-          "style": {
-            "navigationBarTitleText": "选择报名信息"
-          }
-        },
-        {
-          "path": "store-pick",
-          "style": {
-            "navigationBarTitleText": "选择门店"
-          }
-        },
-        {
-          "path": "coupon-pick",
-          "style": {
-            "navigationBarTitleText": "选择优惠券"
-          }
-        },
-        {
-          "path": "pay-result",
-          "style": {
-            "navigationBarTitleText": "提交完成"
-          }
-        },
-        {
-          "path": "map",
-          "style": {
-            "navigationBarTitleText": "配送范围"
-          }
-        }
-      ]
-    },
-    {
-      "root": "plugins/clerk",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "核销首页"
-          }
-        },
-        {
-          "path": "statics/statics",
-          "style": {
-            "navigationBarTitleText": "核销统计"
-          }
-        },
-        {
-          "path": "order/order",
-          "style": {
-            "navigationBarTitleText": "核销订单"
-          }
-        },
-        {
-          "path": "detail/detail",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/order",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "我的订单"
-          }
-        },
-        {
-          "path": "order-detail/order-detail",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "express-detail/express-detail",
-          "style": {
-            "navigationBarTitleText": "物流详情"
-          }
-        },
-        {
-          "path": "refund/refund",
-          "style": {
-            "navigationBarTitleText": "订单售后"
-          }
-        },
-        {
-          "path": "refund/index",
-          "style": {
-            "navigationBarTitleText": "售后列表"
-          }
-        },
-        {
-          "path": "refund-detail/refund-detail",
-          "style": {
-            "navigationBarTitleText": "订单售后"
-          }
-        },
-        {
-          "path": "clerk/clerk",
-          "style": {
-            "navigationBarTitleText": "订单核销"
-          }
-        },
-        {
-          "path": "appraise/appraise",
-          "style": {
-            "navigationBarTitleText": "订单评价"
-          }
-        },
-        {
-          "path": "appraise-finish/index",
-          "style": {
-            "navigationBarTitleText": "评价完成"
-          }
-        },
-        {
-          "path": "express-list/express-list",
-          "style": {
-            "navigationBarTitleText": "物流列表"
-          }
-        }
-      ]
-    },
-    {
-      "root": "plugins/book",
-      "pages": [
-        {
-          "path": "index/index",
-          "style": {
-            "navigationBarTitleText": "预约首页",
-			"navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "goods/goods",
-          "style": {
-            "navigationBarTitleText": "商品详情"
-          }
-        },
-        {
-          "path": "orderDetails/orderDetails",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "order/order",
-          "style": {
-            "navigationBarTitleText": "订单列表"
-          }
-        },
-        {
-          "path": "reservationList/reservationList",
-          "style": {
-            "navigationBarTitleText": "我的预约"
-          }
-        }
-      ]
-    },
-	{
-	  "root": "plugins/scan_code",
-	  "pages": [
+				}
+			}]
+		},
+		{
+			"root": "pages/card",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "我的卡券"
+					}
+				},
+				{
+					"path": "details/details",
+					"style": {
+						"navigationBarTitleText": "卡券详情"
+					}
+				},
+				{
+					"path": "clerk/clerk",
+					"style": {
+						"navigationBarTitleText": "核销卡券"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/balance",
+			"pages": [{
+					"path": "recharge",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "balance",
+					"style": {
+						"navigationBarTitleText": "余额记录"
+					}
+				},
+				{
+					"path": "rules",
+					"style": {
+						"navigationBarTitleText": "余额说明"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "余额说明"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/topic",
+			"pages": [{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "专题列表"
+					}
+				},
+				{
+					"path": "topic",
+					"style": {
+						"navigationBarTitleText": "专题详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods",
+			"pages": [{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					}
+				},
+				{
+					"path": "goods",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "video",
+					"style": {
+						"navigationBarTitleText": "商品",
+						"disableScroll": true,
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}
+			]
+		},
 		{
-		  "path": "index/index",
-		  "style": {
-			"navigationBarTitleText": "当面付"
-		  }
+			"root": "pages/member",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "会员中心"
+					}
+				},
+				{
+					"path": "rules/rules",
+					"style": {
+						"navigationBarTitleText": "会员中心"
+					}
+				},
+				{
+					"path": "upgrade/upgrade",
+					"style": {
+						"navigationBarTitleText": "升级会员"
+					}
+				},
+				{
+					"path": "detail/detail",
+					"style": {
+						"navigationBarTitleText": "会员特权说明"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/user-center",
+			"pages": [{
+					"path": "user-center",
+					"style": {
+						"navigationBarTitleText": "中心"
+					}
+				},
+				{
+					"path": "integral-detail/integral-detail",
+					"style": {
+						"navigationBarTitleText": "积分明细"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/address",
+			"pages": [{
+					"path": "address",
+					"style": {
+						"navigationBarTitleText": "报名信息"
+					}
+				},
+				{
+					"path": "address-edit",
+					"style": {
+						"navigationBarTitleText": "编辑地址"
+					}
+				}
+			]
 		},
 		{
-		  "path": "index/coupon",
-		  "style": {
-			"navigationBarTitleText": "选择优惠券"
-		  }
+			"root": "pages/share",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "分销中心"
+					}
+				},
+				{
+					"path": "add/add",
+					"style": {
+						"navigationBarTitleText": "分销商申请"
+					}
+				},
+				{
+					"path": "cash/cash",
+					"style": {
+						"navigationBarTitleText": "申请提现"
+					}
+				},
+				{
+					"path": "money/money",
+					"style": {
+						"navigationBarTitleText": "分销佣金"
+					}
+				},
+				{
+					"path": "order/order",
+					"style": {
+						"navigationBarTitleText": "分销订单"
+					}
+				},
+				{
+					"path": "cash-detail/cash-detail",
+					"style": {
+						"navigationBarTitleText": "提现明细"
+					}
+				},
+				{
+					"path": "team/team",
+					"style": {
+						"navigationBarTitleText": "我的团队"
+					}
+				},
+				{
+					"path": "qrcode/qrcode",
+					"style": {
+						"navigationBarTitleText": "推广二维码"
+					}
+				},
+				{
+					"path": "level/level",
+					"style": {
+						"navigationBarTitleText": "升级条件"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order-submit",
+			"pages": [{
+					"path": "order-submit",
+					"style": {
+						"navigationBarTitleText": "结算"
+					}
+				},
+				{
+					"path": "address-pick",
+					"style": {
+						"navigationBarTitleText": "选择报名信息"
+					}
+				},
+				{
+					"path": "store-pick",
+					"style": {
+						"navigationBarTitleText": "选择门店"
+					}
+				},
+				{
+					"path": "coupon-pick",
+					"style": {
+						"navigationBarTitleText": "选择优惠券"
+					}
+				},
+				{
+					"path": "pay-result",
+					"style": {
+						"navigationBarTitleText": "提交完成"
+					}
+				},
+				{
+					"path": "map",
+					"style": {
+						"navigationBarTitleText": "配送范围"
+					}
+				}
+			]
+		},
+		{
+			"root": "plugins/clerk",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "核销首页"
+					}
+				},
+				{
+					"path": "statics/statics",
+					"style": {
+						"navigationBarTitleText": "核销统计"
+					}
+				},
+				{
+					"path": "order/order",
+					"style": {
+						"navigationBarTitleText": "核销订单"
+					}
+				},
+				{
+					"path": "detail/detail",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "我的订单"
+					}
+				},
+				{
+					"path": "order-detail/order-detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "express-detail/express-detail",
+					"style": {
+						"navigationBarTitleText": "物流详情"
+					}
+				},
+				{
+					"path": "refund/refund",
+					"style": {
+						"navigationBarTitleText": "订单售后"
+					}
+				},
+				{
+					"path": "refund/index",
+					"style": {
+						"navigationBarTitleText": "售后列表"
+					}
+				},
+				{
+					"path": "refund-detail/refund-detail",
+					"style": {
+						"navigationBarTitleText": "订单售后"
+					}
+				},
+				{
+					"path": "clerk/clerk",
+					"style": {
+						"navigationBarTitleText": "订单核销"
+					}
+				},
+				{
+					"path": "appraise/appraise",
+					"style": {
+						"navigationBarTitleText": "订单评价"
+					}
+				},
+				{
+					"path": "appraise-finish/index",
+					"style": {
+						"navigationBarTitleText": "评价完成"
+					}
+				},
+				{
+					"path": "express-list/express-list",
+					"style": {
+						"navigationBarTitleText": "物流列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "plugins/book",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "预约首页",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods/goods",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "orderDetails/orderDetails",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "order/order",
+					"style": {
+						"navigationBarTitleText": "订单列表"
+					}
+				},
+				{
+					"path": "reservationList/reservationList",
+					"style": {
+						"navigationBarTitleText": "我的预约"
+					}
+				}
+			]
+		},
+		{
+			"root": "plugins/scan_code",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "当面付"
+					}
+				},
+				{
+					"path": "index/coupon",
+					"style": {
+						"navigationBarTitleText": "选择优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/live",
+			"plugins": {
+				"live-player-plugin": {
+					"version": "1.0.3", // 填写该直播组件版本号
+					"provider": "wx2b03c6e691cd7370" // 必须填该直播组件appid
+				}
+			},
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "直播列表",
+						"usingComponents": {
+							"subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+						}
+					}
+				},
+				{
+					"path": "playback",
+					"style": {
+						"navigationBarTitleText": "直播详情"
+					}
+				}
+			]
 		}
-	  ]
-	},   
-	{
-      "root": "pages/live",
-      "plugins": {
-        "live-player-plugin": {
-          "version": "1.0.3", // 填写该直播组件版本号
-          "provider": "wx2b03c6e691cd7370" // 必须填该直播组件appid
-        }
-      },
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "直播列表",
-            "usingComponents": {
-              "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
-            }
-          }
-        },
-        {
-          "path": "playback",
-          "style": {
-            "navigationBarTitleText": "直播详情"
-          }
-        }
-      ]
-    }
-   
-  ]
-}
+
+	]
+}

pages/card/index/index.vue

@@ -1,395 +1,402 @@
 f<template>
-    <app-layout>
-        <app-tab-nav :tabList="tabList" :activeItem="activeTab" @click="tabStatus" :theme="theme"></app-tab-nav>
-        <view class="card-list">
-            <view @click="toDetail(item.id)" v-for="item in list" :key="item.id">
-                <view class="card-item">
-                    <image class="card-img" :src="item.pic_url"></image>
-                    <view class="name">{{item.name}}</view>
-                    <view class="right-box">
-                        <image v-if="item.is_may_use == 1"
-                               class="card-qr"
-                               @click.stop="showModal(item.id)"
-                               src="/static/image/icon/icon-card-qrcode.png"
-                        ></image>
-                        <span>{{activeTab == 3 ? '未核销' : '剩余'}}{{item.surplus_number}}次</span>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="no-list" v-if="list.length === 0">
-            <app-no-goods background="#f7f7f7" :title="title"></app-no-goods>
-        </view>
-        <view class="qr-modal" @click="show=false" v-if="show">
-            <view class="look-qr" @click.stop="showModal(0)">
-                <view>卡券二维码</view>
-                <view>
-                    <image :src="img"></image>
-                </view>
-                <view style="height: 60rpx">
-                    <view @click="saveImg">
-                        <button :class="[`${theme}-background`]">保存图片</button>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </app-layout>
+	<app-layout>
+		<app-tab-nav :tabList="tabList" :activeItem="activeTab" @click="tabStatus" :theme="theme"></app-tab-nav>
+		<view class="card-list">
+			<view @click="toDetail(item.id)" v-for="item in list" :key="item.id">
+				<view class="card-item">
+					<image class="card-img" :src="item.pic_url"></image>
+					<view class="name">{{item.name}}</view>
+					<view class="right-box">
+						<image v-if="item.is_may_use == 1" class="card-qr" @click.stop="showModal(item.id)" src="/static/image/icon/icon-card-qrcode.png"></image>
+						<span>{{activeTab == 3 ? '未核销' : '剩余'}}{{item.surplus_number}}次</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="no-list" v-if="list.length === 0">
+			<app-no-goods background="#f7f7f7" :title="title"></app-no-goods>
+		</view>
+		<view class="qr-modal" @click="show=false" v-if="show">
+			<view class="look-qr" @click.stop="showModal(0)">
+				<view>卡券二维码</view>
+				<view>
+					<image :src="img"></image>
+				</view>
+				<view style="height: 60rpx">
+					<view @click="saveImg">
+						<button :class="[`${theme}-background`]">保存图片</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</app-layout>
 </template>
 
 <script>
-    import appTabNav from "../../../components/basic-component/app-tab-nav/app-tab-nav.vue";
-    import appNoGoods from '../../../components/page-component/app-no-goods/app-no-goods.vue';
+	import appTabNav from "../../../components/basic-component/app-tab-nav/app-tab-nav.vue";
+	import appNoGoods from '../../../components/page-component/app-no-goods/app-no-goods.vue';
 
-    import { mapState } from "vuex";
+	import {
+		mapState
+	} from "vuex";
 
-    export default {
-        data() {
-            return {
-                tabList: [
-                    {id:1, name: '未使用'},
-                    {id:2, name: '已使用'},
-                    {id:3, name: '已过期'}
-                ],
-                show: false,
-                img: '/images/share/img-share-order.png',
-                activeTab: 1,
-                list: [],
-                more: false,
-                page: 2,
-                // title: '暂无未使用优惠券~'
-                title: '暂无课程~',
+	export default {
+		data() {
+			return {
+				tabList: [{
+						id: 1,
+						name: '未使用'
+					},
+					{
+						id: 2,
+						name: '已使用'
+					},
+					{
+						id: 3,
+						name: '已过期'
+					}
+				],
+				show: false,
+				img: '/images/share/img-share-order.png',
+				activeTab: 1,
+				list: [],
+				more: false,
+				page: 2,
+				// title: '暂无未使用优惠券~'
+				title: '暂无课程~',
 				type: 1, //我的课程1 我的比赛2
-            }
-        },
-        components: {
-            'app-tab-nav': appTabNav,
-            'app-no-goods': appNoGoods,
-        },
-        computed: {
-            ...mapState({
-                theme: state => state.mallConfig.theme,
-                userInfo: state => state.user.info,
-            })
-        },
-        methods: {
-            saveImg() {
-                let that = this;
-                // #ifndef MP-ALIPAY
-                uni.authorize({
-                    scope: 'scope.writePhotosAlbum',
-                    success(res) {
-                        if (res.errMsg == "authorize:ok") {
-                            uni.downloadFile({
-                                url: that.img,
-                                success(res) {
-                                    uni.saveImageToPhotosAlbum({
-                                        filePath: res.tempFilePath,
-                                        success() {
-                                            uni.showToast({
-                                                title: '保存成功',
-                                                icon: 'success',
-                                                duration: 1000
-                                            })
-                                        },
-                                        fail() {
-                                            uni.showToast({
-                                                title: '保存失败',
-                                                icon: 'none',
-                                                duration: 1000
-                                            })
-                                        }
-                                    })
-                                }
-                            })
-                        }
-                    },
-                    fail(res) {
-                        uni.showModal({
-                            title: '提示',
-                            content: '保存失败，需要授权保存到相册权限',
-                            showCancel: false,
-                            confirmText: '打开授权',
-                            success(e) {
-                                if (e.confirm) {
-                                    uni.openSetting({});
-                                }
-                            }
-                        });
-                    }
-                })
-                // #endif
-                 // #ifdef MP-ALIPAY
-                my.showLoading({
-                    content: '图片保存中'
-                });
-                my.saveImage({
-                    url: that.img,
-                    showActionSheet: true,
-                    success: (res) => {
-                        uni.showToast({
-                            title: '保存成功',
-                            icon: 'success',
-                            duration: 1000
-                        })
-                    },
-                    fail() {
-                        uni.showToast({
-                            title: '保存失败',
-                            icon: 'none',
-                            duration: 1000
-                        })
-                    },
-                    complete() {
-                        my.hideLoading();
-                    }
-                });
-                // #endif
-            },
+			}
+		},
+		components: {
+			'app-tab-nav': appTabNav,
+			'app-no-goods': appNoGoods,
+		},
+		computed: {
+			...mapState({
+				theme: state => state.mallConfig.theme,
+				userInfo: state => state.user.info,
+			})
+		},
+		methods: {
+			saveImg() {
+				let that = this;
+				// #ifndef MP-ALIPAY
+				uni.authorize({
+					scope: 'scope.writePhotosAlbum',
+					success(res) {
+						if (res.errMsg == "authorize:ok") {
+							uni.downloadFile({
+								url: that.img,
+								success(res) {
+									uni.saveImageToPhotosAlbum({
+										filePath: res.tempFilePath,
+										success() {
+											uni.showToast({
+												title: '保存成功',
+												icon: 'success',
+												duration: 1000
+											})
+										},
+										fail() {
+											uni.showToast({
+												title: '保存失败',
+												icon: 'none',
+												duration: 1000
+											})
+										}
+									})
+								}
+							})
+						}
+					},
+					fail(res) {
+						uni.showModal({
+							title: '提示',
+							content: '保存失败，需要授权保存到相册权限',
+							showCancel: false,
+							confirmText: '打开授权',
+							success(e) {
+								if (e.confirm) {
+									uni.openSetting({});
+								}
+							}
+						});
+					}
+				})
+				// #endif
+				// #ifdef MP-ALIPAY
+				my.showLoading({
+					content: '图片保存中'
+				});
+				my.saveImage({
+					url: that.img,
+					showActionSheet: true,
+					success: (res) => {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							duration: 1000
+						})
+					},
+					fail() {
+						uni.showToast({
+							title: '保存失败',
+							icon: 'none',
+							duration: 1000
+						})
+					},
+					complete() {
+						my.hideLoading();
+					}
+				});
+				// #endif
+			},
 
-            showModal(id) {
-                let that = this;
-                if(id > 0) {
-                    uni.showLoading({
-                        text: '生成中...'
-                    });
-                    that.$request({
-                        url: that.$api.card.qrcode,
-                        data: {
-                            cardId: id,
-                        },
-                        method: 'get'
-                    }).then(response => {
-                        uni.hideLoading();
-                        if (response.code === 0) {
-                            that.show = true;
-                            that.img = response.data.file_path;
-                        } else {
-                            uni.showToast({
-                                title: response.msg,
-                                icon: 'none',
-                                duration: 1000,
-                            });
-                        }
-                    }).catch(response => {
-                        uni.hideLoading();
-                        uni.showToast({
-                            title: response,
-                            icon: 'none',
-                            duration: 1000,
-                        });
-                    });
-                }
-            },
+			showModal(id) {
+				let that = this;
+				if (id > 0) {
+					uni.showLoading({
+						text: '生成中...'
+					});
+					that.$request({
+						url: that.$api.card.qrcode,
+						data: {
+							cardId: id,
+						},
+						method: 'get'
+					}).then(response => {
+						uni.hideLoading();
+						if (response.code === 0) {
+							that.show = true;
+							that.img = response.data.file_path;
+						} else {
+							uni.showToast({
+								title: response.msg,
+								icon: 'none',
+								duration: 1000,
+							});
+						}
+					}).catch(response => {
+						uni.hideLoading();
+						uni.showToast({
+							title: response,
+							icon: 'none',
+							duration: 1000,
+						});
+					});
+				}
+			},
 
-            tabStatus(e) {
-                this.list = [];
-                let id = e.currentTarget.dataset.id;
-                // if (id === 1) {
-                //     this.title = `暂无未使用优惠券~`;
-                // } else if (id === 2) {
-                //     this.title = `暂无已使用优惠券~`;
-                // } else if (id === 3) {
-                //     this.title = `暂无已过期优惠券~`;
-                // }              
+			tabStatus(e) {
+				this.list = [];
+				let id = e.currentTarget.dataset.id;
+				// if (id === 1) {
+				//     this.title = `暂无未使用优惠券~`;
+				// } else if (id === 2) {
+				//     this.title = `暂无已使用优惠券~`;
+				// } else if (id === 3) {
+				//     this.title = `暂无已过期优惠券~`;
+				// }              
 				if (id === 1) {
-					if(this.type == 2){
+					if (this.type == 2) {
+						this.title = `暂无比赛~`;
+					} else {
+						this.title = `暂无课程~`;
+					}
+				} else if (id === 2) {
+					if (this.type == 2) {
+						this.title = `暂无比赛~`;
+					} else {
+						this.title = `暂无课程~`;
+					}
+				} else if (id === 3) {
+					if (this.type == 2) {
 						this.title = `暂无比赛~`;
-					}else{
+					} else {
 						this.title = `暂无课程~`;
 					}
-                } else if (id === 2) {
-                    if(this.type == 2){
-                    	this.title = `暂无比赛~`;
-                    }else{
-                    	this.title = `暂无课程~`;
-                    }
-                } else if (id === 3) {
-                    if(this.type == 2){
-                    	this.title = `暂无比赛~`;
-                    }else{
-                    	this.title = `暂无课程~`;
-                    }
-                }
-                this.page = 2;
-                this.activeTab = id;
-                this.getList();
-            },
-            getList() {
-                let that = this;
-                that.$showLoading({
-                    text: '加载中...'
-                });
-                that.$request({
-                    url: that.type == 1 ? that.$api.card.index+'&type=1':that.$api.card.index+'&type=2',
-                    data: {
-                        status: that.activeTab
-                    },
-                }).then(response=>{
-                    that.$hideLoading();
-                    if(response.code === 0) {
-                        that.list = response.data.list;
-                    }else {
-                        uni.showToast({
-                            title: response.msg,
-                            icon: 'none',
-                            duration: 1000
-                        });
-                    }
-                }).catch(() => {
-                    that.$hideLoading();
-                    that.$event.on(that.$const.EVENT_USER_LOGIN).then(()=>{
-                        that.getList();
-                    });
-                });
-            },
-            getMore() {
-                let that = this;
-                uni.showLoading({
-                    title: '加载中...',
-                });
-                that.$request({
-                    url: that.$api.card.index,
-                    data: {
-                        page: that.page,
-                        status: that.activeTab
-                    },
-                }).then(response=>{
-                    uni.hideLoading();
-                    if(response.code === 0) {
-                        if(response.data.list.length > 0) {
-                            that.loading = null;
-                            that.list = that.list.concat(response.data.list);
-                            that.page++;
-                        }
-                    }else {
-                        uni.showToast({
-                            title: response.msg,
-                            icon: 'none',
-                            duration: 1000,
-                        });
-                    }
-                }).catch(() => {
-                    that.$hideLoading();
-                });
-            },
-            toDetail(id) {
-                uni.navigateTo({
-                    url: `/pages/card/details/details?id=${id}`
-                });
-            },
-        },
-        onLoad(option) {
+				}
+				this.page = 2;
+				this.activeTab = id;
+				this.getList();
+			},
+			getList() {
+				let that = this;
+				that.$showLoading({
+					text: '加载中...'
+				});
+				that.$request({
+					url: that.type == 1 ? that.$api.card.index + '&type=1' : that.type == 2 ? that.$api.card.index + '&type=2' : that.$api.card.index + '&type=3',
+					data: {
+						status: that.activeTab
+					},
+				}).then(response => {
+					that.$hideLoading();
+					if (response.code === 0) {
+						that.list = response.data.list;
+					} else {
+						uni.showToast({
+							title: response.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch(() => {
+					that.$hideLoading();
+					that.$event.on(that.$const.EVENT_USER_LOGIN).then(() => {
+						that.getList();
+					});
+				});
+			},
+			getMore() {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...',
+				});
+				that.$request({
+					url: that.$api.card.index,
+					data: {
+						page: that.page,
+						status: that.activeTab
+					},
+				}).then(response => {
+					uni.hideLoading();
+					if (response.code === 0) {
+						if (response.data.list.length > 0) {
+							that.loading = null;
+							that.list = that.list.concat(response.data.list);
+							that.page++;
+						}
+					} else {
+						uni.showToast({
+							title: response.msg,
+							icon: 'none',
+							duration: 1000,
+						});
+					}
+				}).catch(() => {
+					that.$hideLoading();
+				});
+			},
+			toDetail(id) {
+				uni.navigateTo({
+					url: `/pages/card/details/details?id=${id}`
+				});
+			},
+		},
+		onLoad(option) {
 			console.log(option)
 			this.type = option.type
-            this.getList();
-        },
+			this.getList();
+		},
 		onShow() {
-			setTimeout(()=>{
+			setTimeout(() => {
 				uni.setNavigationBarTitle({
-					title: this.type == 1 ?'我的课程':'我的比赛'
+					title: this.type == 1 ? '我的课程' : this.type==2?'我的比赛':'我的培训'
 				});
-			},1000)
+			}, 1000)
 		},
-        onReachBottom() {
-            this.getMore();
-        }
-    }
+		onReachBottom() {
+			this.getMore();
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-    .no-list {
-        margin-top: #{150upx};
-    }
-    .card-list {
-        width: 100%;
-        padding-top: #{10rpx};
-        background-color: #f7f7f7;
-    }
+	.no-list {
+		margin-top: #{150upx};
+	}
+
+	.card-list {
+		width: 100%;
+		padding-top: #{10rpx};
+		background-color: #f7f7f7;
+	}
 
-    .card-item {
-        height: #{180rpx};
-        margin: #{20rpx};
-        background-color: #fff;
-        color: #353535;
-        font-size: #{30rpx};
-        display: flex;
-        align-items: center;
-        border-radius: 16#{rpx};
+	.card-item {
+		height: #{180rpx};
+		margin: #{20rpx};
+		background-color: #fff;
+		color: #353535;
+		font-size: #{30rpx};
+		display: flex;
+		align-items: center;
+		border-radius: 16#{rpx};
 
-        .name {
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            width: 402#{rpx};
-            margin-left:35#{rpx};
-        }
+		.name {
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 402#{rpx};
+			margin-left:35#{rpx};
+		}
 
-        .card-img {
-            height: #{88rpx};
-            width: #{88rpx};
-            border-radius: 50%;
-            margin-left:24#{rpx};
-        }
+		.card-img {
+			height: #{88rpx};
+			width: #{88rpx};
+			border-radius: 50%;
+			margin-left:24#{rpx};
+		}
 
-        .right-box {
-            margin: #{65rpx} #{35rpx};
-            display: flex;
-            flex-direction:column;
-            align-items: center;
+		.right-box {
+			margin: #{65rpx} #{35rpx};
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-            .card-qr {
-                height: #{50rpx};
-                width: #{50rpx};
-            }
+			.card-qr {
+				height: #{50rpx};
+				width: #{50rpx};
+			}
 
-            span {
-                font-size:20#{rpx};
-                color: #353535;
-                margin-top:10#{rpx};
-            }
-        }
-    }
+			span {
+				font-size:20#{rpx};
+				color: #353535;
+				margin-top:10#{rpx};
+			}
+		}
+	}
 
-    .qr-modal {
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 0;
-        background-color: rgba(0, 0, 0, 0.5);
-        height: 100%;
-        width: 100%;
-        z-index: 2;
-    }
+	.qr-modal {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		height: 100%;
+		width: 100%;
+		z-index: 2;
+	}
 
-    .look-qr {
-        position: absolute;
-        background-color: #fff;
-        width: #{550rpx};
-        height: #{700rpx};
-        left: 50%;
-        margin-left: #{-275rpx};
-        top: 20%;
-        border-radius: #{10rpx};
-        text-align: center;
-        padding: #{50rpx};
-        font-size: #{34rpx};
-        color: #353535;
-    }
+	.look-qr {
+		position: absolute;
+		background-color: #fff;
+		width: #{550rpx};
+		height: #{700rpx};
+		left: 50%;
+		margin-left: #{-275rpx};
+		top: 20%;
+		border-radius: #{10rpx};
+		text-align: center;
+		padding: #{50rpx};
+		font-size: #{34rpx};
+		color: #353535;
+	}
 
-    .look-qr image {
-        margin-top: #{25rpx};
-        height: #{450rpx};
-        width: #{450rpx};
-    }
+	.look-qr image {
+		margin-top: #{25rpx};
+		height: #{450rpx};
+		width: #{450rpx};
+	}
 
-    .look-qr button {
-        margin-top: #{15rpx};
-        height: #{60rpx};
-        line-height: #{60rpx};
-        color: #fff;
-        font-size: #{28rpx};
-        width: #{200rpx};
-    }
-</style>
+	.look-qr button {
+		margin-top: #{15rpx};
+		height: #{60rpx};
+		line-height: #{60rpx};
+		color: #fff;
+		font-size: #{28rpx};
+		width: #{200rpx};
+	}
+</style>

pages/order-submit/order-submit.vue

@@ -228,8 +228,8 @@
 
 					<view v-if="mch.goods_list.length!=0" v-for="(item,index) in mch.goods_list" :key="index">
 						<view v-if="item.form_batch.length!=0">
-							<app-diy-form v-for="(ite,idx) in item.form_batch" :key="idx" :title="ite.name" :list="ite.value" @input="handleOrderFormInput" @validate="handleOrderFormValidate"
-							 :sign="mchIndex" label-position="top"></app-diy-form>
+							<app-diy-form v-for="(ite,idx) in item.form_batch" :key="idx" :title="ite.name" :list="ite.value" @input="handleOrderFormInput"
+							 @validate="handleOrderFormValidate" :sign="mchIndex" label-position="top"></app-diy-form>
 						</view>
 					</view>
 
@@ -650,16 +650,30 @@
 						form_data: JSON.stringify(this.$store.state.orderSubmit.formData),
 					},
 				}).then(response => {
-					if (response.code === 0) {
-						this.getPayOrderId(response.data.queue_id, response.data.token);
-					} else {
-						this.submitLock = false;
+					if (this.previewData.is_train) {
 						uni.hideLoading();
 						uni.showModal({
-							title: '提示',
-							content: response.msg,
+							title: "提示",
+							content: "提交成功，请等待审核",
 							showCancel: false,
-						});
+							success() {
+								uni.redirectTo({
+									url: '/pages/order/index/index?status=0',
+								});
+							}
+						})
+					} else {
+						if (response.code === 0) {
+							this.getPayOrderId(response.data.queue_id, response.data.token);
+						} else {
+							this.submitLock = false;
+							uni.hideLoading();
+							uni.showModal({
+								title: '提示',
+								content: response.msg,
+								showCancel: false,
+							});
+						}
 					}
 				}).catch(e => {
 					this.submitLock = false;
@@ -717,7 +731,6 @@
 							url: `/pages/order-submit/pay-result?payment_order_union_id=${data.id}&order_page_url=${encodeURIComponent(this.orderPageUrl)}`,
 						});
 					} else {
-
 						let page_url = this.orderPageUrl;
 						if (page_url.indexOf('?') === -1) {
 							page_url += '?'
@@ -757,6 +770,7 @@
 								});
 							},
 						});
+						console.log(this.orderPageUrl)
 					}
 				});
 			},

pages/user-center/user-center.vue

@@ -36,7 +36,6 @@
             :margin="true"
             :round="true"
         ></app-my-service>
-
         <app-copyright 
             v-if="copyright && copyright.status == '1'"
             background-color="transparent"