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

config/dev.js

@@ -6,7 +6,7 @@ module.exports = {
     // HOST: '"http://192.168.89.147:8080"',
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
-    VERSION: '"2.0.33"',
+    VERSION: '"3.0.3_2021-12-23"',
   },
   mini: {},
   h5: {},

config/prod.js

@@ -3,9 +3,9 @@ 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"',
-    VERSION: '"3.0.1_2021-11-10"',
+    VERSION: '"3.0.3_2021-12-23"',
   },
   mini: {},
   h5: {

project.config.json

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

src/components/foodCards/CustomCard/index.jsx

@@ -2,6 +2,7 @@ import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
+import formatPrice from "@/utils/formatPrice";
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
 import DeleteTravel from '@/assets/icons/Travel/delete.png'
@@ -39,7 +40,7 @@ export default (props) => {
                 {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
               </View>
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
               </View>
               <View className='cpn-md-act'>
                 <Location {...item} />

src/components/foodCards/RecommendedCard/index.jsx

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/taro'
 import { View, Text, } from '@tarojs/components'
 import { compressImage } from '@/utils'
+import formatPrice from "@/utils/formatPrice";
 import CouponCard from '@/components/CouponCard'
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
@@ -55,7 +56,7 @@ export default (props) => {
                 {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
               </View>
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
               </View>
               <View className='cpn-md-act'>
                 <Location {...item} />

src/components/foodCards/ShareCard/index.jsx

@@ -5,10 +5,9 @@ import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
+import formatPrice from "@/utils/formatPrice";
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
-import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
-
 
 
 import './style.less'
@@ -47,7 +46,7 @@ export default (props) => {
                     {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
                   </View>
                   <View className='cpn-card-text' style={{ marginTop: '5px' }}>
-                    <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                    <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
                   </View>
                   <View className='cpn-md-act'>
                     <Location {...det} />

src/components/foodCards/ShopNoteCard/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import { View, Picker, Image, ScrollView, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
+import formatPrice from "@/utils/formatPrice";
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
@@ -133,7 +134,7 @@ export default (props) => {
                 {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
               </View>
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? 0 / 100 : item.averagePrice / 100).toFixed(2)}元`}</Text>
+                <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
               </View>
               <View className='cpn-md-act'>
                 <Location {...det} />