Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx835627a9b9b3932a",
+  "appid": "wx06a7372d48d56843",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/BossCard/index.jsx

@@ -33,7 +33,7 @@ export default (props) => {
       <CouponMedia onClick={goFood}>
         <CouponMedia.Header
           cashback={item.cashback}
-          image={compressImage(item.poster)}
+          image={compressImage(item.poster, 'thumb')}
           badge='food'
         />
         <CouponMedia.Body star={st}>

src/components/CouponCard/Media/Header.jsx

@@ -14,7 +14,7 @@ export default (props) => {
       {enableCashback && <Cashback money={cashback} style={{ marginTop: '-10px' }} />}
       <View className='coupun-media_thumb'>
         <BadgeTag type={badge} />
-        <Image src={image} />
+        <Image src={image} webp />
       </View>
     </View>
   )

src/pages/MineUserAll/AllOrder/index.jsx

@@ -10,7 +10,6 @@ const tabs = ['全部', '待支付', '待核销', '已使用', '已过期'].map(
 
 const TabBar = (props) => {
   const handleClick = (e) => {
-    console.log('-----------------handleTabChange----------------', e)
     const { index } = e.detail
     props.onClick(index)
   }

src/utils/index.js

@@ -61,15 +61,17 @@ export function random(prefix) {
  * @param {*} url 
  * @returns 
  */
-export function compressImage(url) {
+export function compressImage(url, typ) {
   if (!url) return url;
 
   // GIF 不压缩
   if (url.indexOf('.gif') > -1) return url;
 
+  const style = typ || 'cmp80'
+
   // eslint-disable-next-line no-undef
   if (url.indexOf(OSS) > -1) {
-    return `${url}?x-oss-process=style/cmp80`
+    return `${url}?x-oss-process=style/${style}`.replace('http://', 'https://')
   }
 
   return url;