李志伟 3 vuotta sitten
vanhempi
commit
6640d48e8b

+ 1
- 1
config/dev.js Näytä tiedosto

@@ -4,7 +4,7 @@ module.exports = {
4 4
   },
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.89.147:8080"',
7
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
7
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
8 8
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
9 9
   },
10 10
   mini: {},

+ 1
- 1
project.config.json Näytä tiedosto

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

+ 1
- 1
src/hotel/pages/components/Extend/index.jsx Näytä tiedosto

@@ -110,7 +110,7 @@ export default (props) => {
110 110
             : item.contentType == 'video' ?
111 111
               <View>
112 112
                 <SlideView del onDelete={handelDelete}>
113
-                  <Video className='storezn' style={{ width: '100%', display: 'block' }} src={eimg} />
113
+                  <Video style={{ width: '100%', display: 'block' }} src={eimg} />
114 114
                 </SlideView>
115 115
               </View>
116 116
               : null

+ 1
- 0
src/hotel/pages/components/Extend/style.less Näytä tiedosto

@@ -48,6 +48,7 @@
48 48
     line-height: 64px;
49 49
     margin-bottom: 60px;
50 50
     text-align: justify;
51
+    white-space: pre-wrap;
51 52
   }
52 53
   // .weui-slideview__btn__wrp{
53 54
   //   background: #FFFFFF;

+ 5
- 7
src/shop/pages/spread/spreadIndex.jsx Näytä tiedosto

@@ -22,15 +22,16 @@ import { View } from '@tarojs/components'
22 22
 
23 23
 export default withLayout((props) => {
24 24
   const { router, person } = props
25
-
26 25
   const { params } = useRouter()
27
-  const { tab } = params || {}
26
+  const { tab,cardShop } = params || {}
28 27
   const [currentTab, setCurrentTab] = useState(0)
28
+  //顶部的商铺列表
29 29
   const [shopList, setShopList] = useState([])
30
+  //当前商铺
30 31
   const [shop, setShop] = useState()
31 32
   const shopId = shop?.shopId
32
-  const [loading, setLoading] = useState(false)
33 33
 
34
+  
34 35
   const [amountType, setAmountType] = useState('order')
35 36
   const [isVerified, setisVerified] = useState(0)
36 37
   const [shopMoney, setShopMoney] = useState([])
@@ -73,14 +74,11 @@ export default withLayout((props) => {
73 74
   }
74 75
 
75 76
   useEffect(() => {
76
-    setLoading(true)
77 77
     if (shopId) {
78 78
       getShopMoney(shopId, amountType).then((e) => {
79 79
         setShopMoney(e)
80
-        setLoading(false)
81
-      }).catch(setLoading(false))
80
+      })
82 81
     }
83
-
84 82
   }, [amountType, shopId, currentTab])
85 83
 
86 84
   //店铺选择