Merge branch 'release'

pages/indexNew/indexNew.js

@@ -99,6 +99,7 @@ Page({
       const para = {
         shareType: options.shareType,
         id: options.id,
+        detailId: options.detailId,
         type: options.type ? options.type : "",
         defaultGridId: options.defaultGridId ? options.defaultGridId : "",
       }
@@ -351,6 +352,10 @@ Page({
                     wx.navigateTo({
                       url: `/subpages/heart/pages/heartDetail/heartDetail?id=${para.id}`
                     })
+                  } else if (para.shareType === 'newsDetail') {
+                    wx.navigateTo({
+                      url: `/subpages/home/pages/newsDetail/newsDetail?id=${para.detailId}`
+                    })
                   } 
                   wx.removeStorageSync("shareObj")
                 }    

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.19"
+    const versionNum = "1.4.20"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

project.config.json

@@ -63,16 +63,16 @@
 			"list": [
 				{
 					"id": 0,
-					"name": "带参数二维码",
+					"name": "pages/formid/formid",
-					"pathName": "pages/index/index",
+					"pathName": "pages/formid/formid",
-					"query": "scene=1277169327606366209&inviteUserId=12345",
+					"query": "gid=1233592630168813569",
 					"scene": 1011
 				},
 				{
 					"id": 1,
 					"name": "pages/indexNew/indexNew",
 					"pathName": "pages/indexNew/indexNew",
-					"query": "gid=1175270967490244609",
+					"query": "scene=1233592630168813569",
 					"scene": 1011
 				},
 				{
@@ -83,10 +83,10 @@
 					"scene": 1011
 				},
 				{
-					"id": -1,
+					"id": 3,
 					"name": "subpages/home/pages/newsDetail/newsDetail",
 					"pathName": "subpages/home/pages/newsDetail/newsDetail",
-					"query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1",
+					"query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569",
 					"scene": null
 				},
 				{
@@ -128,6 +128,7 @@
 					"id": -1,
 					"name": "注册页面",
 					"pathName": "pages/toRegister/toRegister",
+					"query": "",
 					"scene": null
 				}
 			]

subpages/associationNew/pages/eventlist/eventlist.wxss

@@ -60,7 +60,7 @@ page {
 }
 
 .image-list {
-  width: calc(100% - 58rpx);
+  /* width: calc(100% - 58rpx); */
   margin-top: 30rpx;
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(208rpx, 1fr));

subpages/home/pages/newsDetail/newsDetail.js

@@ -11,6 +11,7 @@ Page({
     infoCompleted: 0,
     noticeObjContent: "",
     residentValue:0,//配置时间
+    defaultGridId: '' //默认网格id
   },
   onLoad (options) {
     this.setData({
@@ -162,7 +163,7 @@ Page({
       // })
     }
   },
-  // 获取默认配置 阅读时间
+  // 获取默认配置, 阅读时间, 获取默认网格
   getResidentConfig (){
     let that = this
     api_getResidentConfig.getResidentConfig().then(res => {
@@ -172,6 +173,10 @@ Page({
             that.setData({
               residentValue:parseInt(item.residentValue)
             })
+          } else if (item.residentCode === "default_grid" && item.residentType === "default_grid") {
+            that.setData({
+              defaultGridId: item.residentValue
+            })
           }
         })
         that.countDown()
@@ -213,4 +218,11 @@ Page({
   onUnload: function () {
     clearInterval(this.data.timer)
   },
+  //2020.7.29 新闻转发-没注册过的人进入默认网格
+  onShareAppMessage(res) {
+    return {
+      title: '新闻资讯-新闻详情',
+      path: `/pages/indexNew/indexNew?shareType=newsDetail&detailId=${this.data.detailId}&defaultGridId=${this.data.defaultGridId}`
+    }
+  },
 })

subpages/understandJs/pages/sclerotia/sclerotia.wxml

@@ -2,6 +2,7 @@
 <!-- 列表 -->
 <view class="list-all">
     <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" data-id="{{item.id}}" bindtap="toDetail">
+        <image src="{{item.imgUrl}}"></image>
         <view class="item-info">
         <view class="item-info-name">{{item.noticeTitle}}
         </view>
@@ -10,7 +11,6 @@
             <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
         </view>
         </view>
-        <image src="{{item.imgUrl}}"></image>
     </view>
 </view>
  <!--加载更多提示-->

subpages/understandJs/pages/sclerotia/sclerotia.wxss

@@ -44,6 +44,7 @@ page {
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 2;
     overflow: hidden;
+    margin: 0 auto;
   }
   
   .list-all .list-item .item-info .item-info-time {
@@ -54,6 +55,7 @@ page {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+    left: 22rpx;
   }
   
   .list-all .list-item .item-info .item-info-time text {