Ver código fonte

修改分包以及活动展示

zhuliu 1 ano atrás
pai
commit
0de197cfd0
46 arquivos alterados com 76 adições e 93 exclusões
  1. 53 70
      app.json
  2. 4 4
      myComponents/navBar/navBar.js
  3. 1 1
      myComponents/tabBar/tabBar.js
  4. 2 2
      myComponents/tabBar/tabBar.wxml
  5. 1 1
      pages/hotProduct/hotProduct.js
  6. 0 0
      pageIndex/hotProduct/hotProduct.json
  7. 1 1
      pages/hotProduct/hotProduct.wxml
  8. 1 1
      pages/hotProduct/hotProduct.wxss
  9. 0 0
      pageIndex/index/index.js
  10. 0 0
      pageIndex/index/index.json
  11. 0 0
      pageIndex/index/index.wxml
  12. 0 0
      pageIndex/index/index.wxss
  13. 7 7
      pages/mine/mine.js
  14. 0 0
      pageIndex/mine/mine.json
  15. 1 1
      pages/mine/mine.wxml
  16. 1 1
      pages/mine/mine.wxss
  17. 0 0
      pages/image/350.png
  18. 1 1
      pages/login/login.js
  19. BIN
      static/icon/14.png
  20. BIN
      static/icon/a-yijiankong2x.png
  21. BIN
      static/icon/anquanbangzhu.png
  22. BIN
      static/icon/dajiaduzaimai-copy.png
  23. BIN
      static/icon/dajiaduzaimai.png
  24. BIN
      static/icon/daochu.png
  25. BIN
      static/icon/fanhui.png
  26. BIN
      static/icon/gongdan.png
  27. BIN
      static/icon/group43.png
  28. BIN
      static/icon/guanzhu.png
  29. BIN
      static/icon/icon-test.png
  30. BIN
      static/icon/monitor.png
  31. BIN
      static/icon/rengongkefu.png
  32. BIN
      static/icon/renyuan.png
  33. BIN
      static/icon/sangedian-type-1.png
  34. BIN
      static/icon/shangchuan.png
  35. BIN
      static/icon/sousuo.png
  36. BIN
      static/icon/weibiaoti-_huabanfuben.png
  37. BIN
      static/icon/wode-copy.png
  38. BIN
      static/icon/wode.png
  39. BIN
      static/icon/zhaoxiangji.png
  40. BIN
      static/icon/zhuye-copy.png
  41. BIN
      static/icon/zhuye.png
  42. BIN
      static/icon/zhuye1.png
  43. BIN
      static/image/会员管理活动.jpg
  44. BIN
      static/image/小霞讲涉外公众号.jpg
  45. BIN
      static/image/邀请有礼活动.jpg
  46. 3 3
      utils/activity.js

+ 53 - 70
app.json

@@ -1,87 +1,70 @@
 {
   "pages": [
-    "pages/index/index",
-    "pages/mine/mine",
-    "pages/login/login",
-    "pages/riskAssessment/riskAssessment",
-    "pages/register/register",
-    "pages/hotProduct/hotProduct",
-    "pages/myFollow/myFollow",
-    "pages/searchRecords/searchRecords",
-    
-    "pages/searchResults/searchResults",
-    "pages/successReminder/successReminder",
-    "pages/selectedPatents/selectedPatents",
-    
-    "pages/collectPatent/collectPatent",
-    "pages/personalInformation/personalInformation",
-    "pages/patentDetails/patentDetails",
-    "pages/showImageList/showImageList",
-    
-    "pages/webView/webView",
-    "pages/productDetail/productDetail",
-    
-    "pages/voucher/voucher"
-    
-  ],
-  "subpackages": [  
-    {  
-      "root": "pages/about",  
-      "pages": [  
-        "about",
-        "introduce",
-        "connection",
-        "Feedback",
-        "invite"  
-      ]  
-    },
-    {  
-      "root": "pages/memberCenter",  
-      "pages": [  
-        "menberCenter2" 
-      ]  
-    },
-    {  
-      "root": "pages/form",  
-      "pages": [  
-        "application/application",
-        "rightsProtection/rightsProtection",
-        "appeal/appeal",
-        "riskAssessment/riskAssessment",
-        "addProduct/addProduct"
-      ]  
-    },
-    {  
-      "root": "pages/monitor",  
-      "pages": [  
-        "monitor",
-        "monitoringRecord"
-      ]  
-    },
-    {  
-      "root": "pages/myWork",  
-      "pages": [  
-        "myWork",
-        "workDetail"
-      ]  
-    }
+    "pageIndex/index/index",
+    "pageIndex/mine/mine",
+    "pageIndex/hotProduct/hotProduct"
+
   ],
+  "subpackages": [{
+    "root": "pages",
+    "pages": [
+      "login/login",
+
+      "register/register",
+
+      "myFollow/myFollow",
+      "searchRecords/searchRecords",
+
+
+      "successReminder/successReminder",
+      "selectedPatents/selectedPatents",
+
+      "collectPatent/collectPatent",
+      "personalInformation/personalInformation",
+      "patentDetails/patentDetails",
+      "showImageList/showImageList",
+
+      "productDetail/productDetail",
+
+      "voucher/voucher",
+
+      "about/about",
+      "about/introduce",
+      "about/connection",
+      "about/Feedback",
+      "about/invite",
+      "memberCenter/menberCenter2",
+      "form/application/application",
+      "form/rightsProtection/rightsProtection",
+      "form/appeal/appeal",
+      "form/riskAssessment/riskAssessment",
+      "form/addProduct/addProduct",
+
+      "monitor/monitor",
+      "monitor/monitoringRecord",
+      "myWork/myWork",
+      "myWork/workDetail",
+
+      "webView/webView",
+      "searchResults/searchResults",
+      "riskAssessment/riskAssessment"
+    ]
+  }],
   "tabBar": {
-    "list": [
-      {
-        "pagePath": "pages/index/index",
+    "list": [{
+        "pagePath": "pageIndex/index/index",
         "text": "主页",
         "iconPath": "/static/image/主页.png",
         "selectedIconPath": "/static/image/主页-click.png"
       },
       {
-        "pagePath": "pages/hotProduct/hotProduct",
+        "pagePath": "pageIndex/hotProduct/hotProduct",
         "text": "爆品风险",
         "iconPath": "/static/image/爆品.png",
         "selectedIconPath": "/static/image/爆品-click.png"
       },
       {
-        "pagePath": "pages/mine/mine",
+        "pagePath": "pageIndex/mine/mine",
         "text": "我的",
         "iconPath": "/static/image/我的.png",
         "selectedIconPath": "/static/image/我的-click.png"

+ 4 - 4
myComponents/navBar/navBar.js

@@ -39,11 +39,11 @@ Component({
     clickBack(){
       var pages = getCurrentPages()
       if (pages.length >= 2) {
-        // if(pages[pages.length-2].route == "pages/mine/mine" && pages[pages.length-1].route == "pages/login/login"){
+        // if(pages[pages.length-2].route == "pageIndex/mine/mine" && pages[pages.length-1].route == "pages/login/login"){
           
         //   // if(pages.length == 2){
         //   //   wx.switchTab({
-        //   //     url: '/pages/index/index'
+        //   //     url: '/pageIndex/index/index'
         //   //   });
         //   // }else{
         //     wx.navigateBack({
@@ -55,14 +55,14 @@ Component({
         // }
       } else {
           wx.switchTab({
-              url: '/pages/index/index'
+              url: '/pageIndex/index/index'
           });
       }
   },
   // 胶囊--首页
    clickHome() {
       wx.switchTab({
-          url: "/pages/index/index"
+          url: "/pageIndex/index/index"
       });
   },
  

+ 1 - 1
myComponents/tabBar/tabBar.js

@@ -7,7 +7,7 @@ Component({
   properties: {
     page:{
       type:String,
-      value:'/pages/index/index',
+      value:'/pageIndex/index/index',
       observers:function(val){
         this.changeTab(val)
       }

+ 2 - 2
myComponents/tabBar/tabBar.wxml

@@ -1,6 +1,6 @@
 <!--myComponents/tabBar/tabBar.wxml-->
 <wux-tabbar defaultCurrent="{{current}}" position="bottom" bind:change="onChange">
-      <wux-tabbar-item key="/pages/index/index" title="主页">
+      <wux-tabbar-item key="/pageIndex/index/index" title="主页">
         <view class="iconfont myIconzhuye" slot="icon-on"></view>
         <view class="iconfont myIconzhuye" slot="icon-off"></view>
       </wux-tabbar-item>
@@ -8,7 +8,7 @@
         <view class="iconfont myIcondajiaduzaimai" slot="icon-on"></view>
         <view class="iconfont myIcondajiaduzaimai" slot="icon-off"></view>
       </wux-tabbar-item>
-      <wux-tabbar-item key="/pages/mine/mine" title="我的">
+      <wux-tabbar-item key="/pageIndex/mine/mine" title="我的">
         <view class="iconfont myIconwode" slot="icon-on"></view>
         <view class="iconfont myIconwode" slot="icon-off"></view>
       </wux-tabbar-item>

+ 1 - 1
pages/hotProduct/hotProduct.js

@@ -1,4 +1,4 @@
-// pages/hotProduct/hotProduct.js
+// pageIndex/hotProduct/hotProduct.js
 const api = require('../../api/index')
 Page({
 

pages/hotProduct/hotProduct.json → pageIndex/hotProduct/hotProduct.json


+ 1 - 1
pages/hotProduct/hotProduct.wxml

@@ -1,4 +1,4 @@
-<!--pages/hotProduct/hotProduct.wxml-->
+<!--pageIndex/hotProduct/hotProduct.wxml-->
 <van-notify id="van-notify" />
 <followPopup show="{{showPopup}}" showCollect="{{false}}" changeFollow="{{changeFollow}}" bindonClose="closePopup" bindattention="attention" bindcancelFollow="cancelFollow"></followPopup>
 <myDialog isShown="{{showDialog}}" title="爆款风险" showFoot="{{false}}" bindcancel="closeDialog">

+ 1 - 1
pages/hotProduct/hotProduct.wxss

@@ -1,4 +1,4 @@
-/* pages/hotProduct/hotProduct.wxss */
+/* pageIndex/hotProduct/hotProduct.wxss */
 .hotProduct{
   padding:0 20rpx;
   height: 100vh;

pages/index/index.js → pageIndex/index/index.js


pages/index/index.json → pageIndex/index/index.json


pages/index/index.wxml → pageIndex/index/index.wxml


pages/index/index.wxss → pageIndex/index/index.wxss


+ 7 - 7
pages/mine/mine.js

@@ -1,4 +1,4 @@
-// pages/mine/mine.js
+// pageIndex/mine/mine.js
 const api = require('../../api/index')
 const activity = require('../../utils/activity')
 const app = getApp()
@@ -64,12 +64,12 @@ Page({
         icon:'myIconmonitor',
         page:'/pages/monitor/monitor'
       },
-      {
-        type:7,
-        label:'邀请有礼',
-        icon:'',
-        page:'/pages/about/invite'
-      },
+      // {
+      //   type:7,
+      //   label:'邀请有礼',
+      //   icon:'',
+      //   page:'/pages/about/invite'
+      // },
       {
         type:5,
         label:'关于我们',

pages/mine/mine.json → pageIndex/mine/mine.json


+ 1 - 1
pages/mine/mine.wxml

@@ -1,4 +1,4 @@
-<!--pages/mine/mine.wxml-->
+<!--pageIndex/mine/mine.wxml-->
 <van-notify id="van-notify" />
 <van-action-sheet
   show="{{ show }}"

+ 1 - 1
pages/mine/mine.wxss

@@ -1,4 +1,4 @@
-/* pages/mine/mine.wxss */
+/* pageIndex/mine/mine.wxss */
 .mine{
   padding: 0 20rpx;
 }

static/image/350.png → pages/image/350.png


+ 1 - 1
pages/login/login.js

@@ -214,7 +214,7 @@ Page({
       wx.navigateBack()
     } else {
       wx.switchTab({
-          url: '/pages/index/index'
+          url: '/pageIndex/index/index'
       });
   }
     

BIN
static/icon/14.png


BIN
static/icon/a-yijiankong2x.png


BIN
static/icon/anquanbangzhu.png


BIN
static/icon/dajiaduzaimai-copy.png


BIN
static/icon/dajiaduzaimai.png


BIN
static/icon/daochu.png


BIN
static/icon/fanhui.png


BIN
static/icon/gongdan.png


BIN
static/icon/group43.png


BIN
static/icon/guanzhu.png


BIN
static/icon/icon-test.png


BIN
static/icon/monitor.png


BIN
static/icon/rengongkefu.png


BIN
static/icon/renyuan.png


BIN
static/icon/sangedian-type-1.png


BIN
static/icon/shangchuan.png


BIN
static/icon/sousuo.png


BIN
static/icon/weibiaoti-_huabanfuben.png


BIN
static/icon/wode-copy.png


BIN
static/icon/wode.png


BIN
static/icon/zhaoxiangji.png


BIN
static/icon/zhuye-copy.png


BIN
static/icon/zhuye.png


BIN
static/icon/zhuye1.png


BIN
static/image/会员管理活动.jpg


BIN
static/image/小霞讲涉外公众号.jpg


BIN
static/image/邀请有礼活动.jpg


+ 3 - 3
utils/activity.js

@@ -4,17 +4,17 @@ module.exports={
     return [
       {
         page:'/pages/about/invite',
-        image:'',
+        image:'/static/image/邀请有礼活动.jpg',
         params:{}
       },
       {
         page:'/pages/memberCenter/menberCenter2',
-        image:'/pages/image/会员管理活动.jpg',
+        image:'/static/image/会员管理活动.jpg',
         params:{}
       },
       {
         url:'https://mp.weixin.qq.com/s/QhRr70pB6e4l2U6B329TVQ',
-        image:'/pages/image/小霞讲涉外公众号.jpg',
+        image:'/static/image/小霞讲涉外公众号.jpg',
         params:{}
       },
     ]