gujiheimao 1 rok pred
rodič
commit
88c0de622e

+ 0 - 1
file/static/category.html

@@ -63,7 +63,6 @@
     let categoryGoodsData = null
     let nowGoodsId = null
 
-
     function showOrNoneCPGD() {
         if (cpgd.style.display) {
             cpgd.style.display = ""

+ 15 - 0
file/static/mobile/info2.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{.title}} - 易租租</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/api/static/css/index.css">
+    <meta name="keywords" content="{{.title}} - 易租租">
+    <meta name="description"
+          content="海外数字商城,为全球用户提供谷歌、苹果、脸书等购买服务,还有苹果、谷歌、steam礼品卡等购买渠道。在这里您还能进行steam代充、steam海外代充、steam钱包代充等,7*24小时为您提供满意的交易。">
+</head>
+<body>
+666666666666666666666666
+</body>
+</html>

+ 1 - 1
file/static/user.html

@@ -162,7 +162,7 @@
 
     let showRouteNameList = ["mobile-login", "router-user-info", "router-user-setting", "router-user-coupon", "router-user-balance", "router-user-earnings", "router-user-order"]
     let showRouteName = "router-user-order"
-    let orderType = ""
+
     document.getElementById("header-return").addEventListener("click", function () {
         showOrNoneUserReturn(false)
     })

+ 2 - 2
file/static/user_order.tmpl

@@ -60,7 +60,7 @@
 </div>
 <script>
     let tagItems = document.querySelectorAll('.router-bar-user-order-view .tag-item');
-
+    let orderType = ""
     function initUserOrder() {
         for (let i = 0; i < tagItems.length; i++) {
             tagItems[i].addEventListener('click', function () {
@@ -68,7 +68,7 @@
                     if (item !== this) {
                         item.classList.remove('tag-item-select')
                     } else {
-                        orderTypeClick(item.dataset)
+                        orderTypeClick(item.dataset.value)
                         item.classList.add('tag-item-select')
                     }
                 })

+ 2 - 2
main.go

@@ -28,10 +28,10 @@ func runGin() {
 	apiGroup := Router.Group(router.Prefix)
 	Router.SetFuncMap(templatefunc.BaseTemplateFunc())
 	//加载模板
-	Router.LoadHTMLGlob("file/static/*")
+	Router.LoadHTMLGlob("file/static/**/**")
 	apiGroup.StaticFS("/static", http.Dir("file/resources"))
 	apiGroup.StaticFS("/assets", http.Dir("file/assets"))
-	proxy(Router)
+	//proxy(Router)
 
 	router.InitRouter(apiGroup)
 	router.InitAuthority(Router)

+ 38 - 0
router/TestRouter.go

@@ -22,6 +22,7 @@ func TestRouth(engine *gin.RouterGroup) {
 
 		//PushRouter(user, "GET", "/home", Home)
 		PushRouter(user, "GET", "/", Home)
+		PushRouter(user, "GET", "/mobile", MobileHome)
 
 		PushRouter(user, "POST", "/order/pay", OrderSubmit)
 		PushRouter(user, "POST", "/test", DataTest)
@@ -102,6 +103,42 @@ func Home(c *gin.Context) {
 
 	c.HTML(http.StatusOK, "index.html", m)
 }
+func MobileHome(c *gin.Context) {
+	m := make(map[string]interface{})
+	//首页宣传信息
+	data, err := dao.GetAdviceData()
+	if err != nil {
+		c.JSON(200, CreateResultError(401, "advice查询失败"))
+		return
+	}
+	marshal, err := json.Marshal(data)
+	if err != nil {
+		fmt.Println(err)
+		c.JSON(200, CreateResultError(401, err.Error()))
+		return
+	}
+	json.Unmarshal(marshal, &m)
+	//首页主题信息
+	list, err := dao.GetTopicList()
+	if err != nil {
+		c.JSON(200, CreateResultError(401, "主题列表查询失败"))
+		return
+	}
+	m2 := map[string]interface{}{
+		"list": list,
+	}
+	//结构体转map
+	d2m, err := json.Marshal(m2)
+	if err != nil {
+		fmt.Println(err)
+		c.JSON(200, CreateResultError(401, err.Error()))
+		return
+	}
+	m["footerType"] = "home"
+	json.Unmarshal(d2m, &m)
+
+	c.HTML(http.StatusOK, "info2.html", m)
+}
 
 func Topic(c *gin.Context) {
 	topicId := c.Query("topicId")
@@ -273,6 +310,7 @@ func GetCategoryListByTypeId(c *gin.Context) {
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
 	list, err := manage.GetGoodsList(domain.Goods{TypeId: cast.ToInt64(typeId)}, cast.ToInt(pageNum), cast.ToInt(pageSize))
+
 	if err != nil {
 		c.JSON(200, CreateResultError(401, "未查询到结果"))
 		return