Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

# Conflicts:
#	config/dev.js

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://dev.jinchengjiaye.com"',
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"https://dev.jinchengjiaye.com"',
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assemble.js

@@ -630,7 +630,7 @@ export default class Detail extends Component {
                   {
                     !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
 
-                    <View className="btn-box">
+                    <View className="btn-box" style="margin: auto; padding: 0;">
                       {
                         (groupState === GroupInProcess && !isJoin) &&
                         (<Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>)

src/pages/activity/item/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
+import { getThumbnail } from '@utils/tools'
 
 export default class Item extends Component {
   static defaultProps = {
@@ -15,7 +16,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={data.mainImg || data.imgUrl}></Image>
+        <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
         <View className="box">
           <View className="title">{data.title}</View>
           {

src/pages/news/detail/index.js

@@ -7,7 +7,7 @@ import WxParse from '@components/wxParse/wxParse'
 import BackHomeBtn from '@components/BackHomeBtn'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
-import { getDownloadURL } from '@utils/tools'
+import { getDownloadURL, getThumbnail } from '@utils/tools'
 import {
   addNewsUv,
   favorNews,

src/pages/news/index.js

@@ -5,6 +5,7 @@ import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { queryNewsList } from '@services/news'
 import { connect } from '@tarojs/redux'
+
 let pageIndex = 1
 
 @connect(state => state.city)

src/pages/news/item.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import dayjs from 'dayjs'
 import './item.scss'
+import { getThumbnail } from '@utils/tools'
 
 export default class NewsItem extends Component {
   static defaultProps = {
@@ -13,7 +14,7 @@ export default class NewsItem extends Component {
     const { data } = this.props
     return (
       <View className="item" key={data.newsId} onClick={this.handleClick}>
-        <Image className="item-img" mode="aspectFill" src={data.newsImg}></Image>
+        <Image className="item-img" mode="aspectFill" src={getThumbnail(data.newsImg)}></Image>
         <View className="item-con">
           <View className="item-con__title">{data.newsName}</View>
           <View className="item-con__date">{dayjs(data.createDate).format('YYYY-MM-DD')}</View>

src/utils/tools.js

@@ -4,6 +4,21 @@ export function times(n) {
   return n > 0 ? '*'.repeat(n - 1).split('*') : []
 }
 
+/**
+ * 
+ * @param {*} img 
+ * @param {*} quality  仅支持 70,50,30,5
+ */
+export function getThumbnail(img, quality) {
+  if (!img) return img
+
+  if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
+    return `${img}?x-oss-process=style/compress${quality || 30}`
+  }
+
+  return img
+}
+
 /**
  * 解析 queryString   a=b&c=d  ==> { a:b, c:d }
  * @param {*} queryString