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

project.config.json

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

src/hotel/pages/components/Extend/index.jsx

             : item.contentType == 'video' ?
               <View>
                 <SlideView del onDelete={handelDelete}>
-                  <Video className='storezn' style={{ width: '100%', display: 'block' }} src={eimg} />
+                  <Video style={{ width: '100%', display: 'block' }} src={eimg} />
                 </SlideView>
               </View>
               : null

src/hotel/pages/components/Extend/style.less

     line-height: 64px;
     margin-bottom: 60px;
     text-align: justify;
+    white-space: pre-wrap;
   }
   // .weui-slideview__btn__wrp{
   //   background: #FFFFFF;

src/shop/pages/spread/spreadIndex.jsx

 
 export default withLayout((props) => {
   const { router, person } = props
-
   const { params } = useRouter()
-  const { tab } = params || {}
+  const { tab,cardShop } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
+  //顶部的商铺列表
   const [shopList, setShopList] = useState([])
+  //当前商铺
   const [shop, setShop] = useState()
   const shopId = shop?.shopId
-  const [loading, setLoading] = useState(false)
 
+  
   const [amountType, setAmountType] = useState('order')
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
   }
 
   useEffect(() => {
-    setLoading(true)
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
         setShopMoney(e)
-        setLoading(false)
-      }).catch(setLoading(false))
+      })
     }
-
   }, [amountType, shopId, currentTab])
 
   //店铺选择