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

src/components/ShopUnused/index.jsx

@@ -25,7 +25,9 @@ export default (props) => {
         <image className='orderImg' src={item.poster} mode='aspectFit' />
         <view className='orderRight'>
           <view className='foodName'>{item.description}</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{(item.commissionCharge / 100).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+
+
+          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
           <view>已下单：等待客户上门就餐</view>
         </view>
         <view className='line' />

src/components/ShopUsed/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
         <View className='orderRight'>
           <View className='foodName'>{item.description}</View>
-          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{(item.commissionCharge / 100).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
+          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
         </View>
 
         <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>

src/components/Spin/style.less

@@ -138,6 +138,7 @@
 }
 
 .loading-wrapper {
+  height: 100%;
   position: relative;
 
   .loading-box {

src/hotel/components/Income/income.less

@@ -1,101 +1,99 @@
-.User-box-sths{
+.User-box-sths {
   display: flex;
-  margin: 40px 0  60px 0;
+  margin: 40px 0 60px 0;
   justify-content: space-around;
   flex-wrap: wrap;
-  .User-box-selectUser{
+  .User-box-selectUser {
     width: 100%;
     font-size: 32px;
     font-weight: bold;
     color: #202020;
     line-height: 32px;
-    margin: 60px 0 70px  0;
+    margin: 60px 0 70px 0;
     text-align: left;
   }
-  .User-box-tourist{
+  .User-box-tourist {
     display: inline-block;
 
-     .Ubs-tourist-image{
+    .Ubs-tourist-image {
       width: 86px;
       height: 86px;
-
     }
-    .Ubs-tourist-text{
+    .Ubs-tourist-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color: #999999;      
+      color: #999999;
     }
   }
-  .User-box-hotelBoss{
+  .User-box-hotelBoss {
     display: inline-block;
-    .Ubs-hotelBoss-image{
+    .Ubs-hotelBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-hotelBoss-text{
+    .Ubs-hotelBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
       color: #202020;
     }
   }
-  .User-box-shopBoss{
-    .Ubs-shopBoss-image{
+  .User-box-shopBoss {
+    .Ubs-shopBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-shopBoss-text{
+    .Ubs-shopBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color:#999999;
+      color: #999999;
     }
   }
-
 }
-.storexx{
+.storexx {
   text-align: center;
   display: flow-root;
-  background: #FFFFFF;
+  background: #ffffff;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
   padding: 50px 30px 64px 40px;
   box-sizing: border-box;
   margin: 0 10px;
-  .storeName{
+  .storeName {
     height: 26px;
     font-size: 28px;
     font-weight: bold;
     color: #202020;
-    margin-bottom:58px;
+    margin-bottom: 58px;
   }
-  .sleft{
+  .sleft {
     float: left;
     text-align: left;
-    .lword{
+    .lword {
       font-size: 26px;
       color: #666666;
       margin-bottom: 40px;
     }
-    .yearMoney{
+    .yearMoney {
       font-size: 28px;
       font-weight: bold;
       color: #202020;
       line-height: 0;
       display: inline-block;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434
+        color: #ff3434;
       }
-      .micon{
+      .micon {
         width: 38px;
         height: 26px;
         margin-left: 20px;
       }
     }
   }
-  .line{
+  .line {
     width: 2px;
     height: 128px;
     border-right: 2px dotted #202020;
@@ -104,25 +102,25 @@
     left: calc(50% - 1px);
     display: block;
   }
-  .sright{
+  .sright {
     float: right;
     text-align: right;
-    .rword{
+    .rword {
       font-size: 26px;
       color: #666666;
       margin-bottom: 40px;
     }
-    .monthMoney{
+    .monthMoney {
       font-size: 28px;
       font-weight: bold;
       color: #202020;
       line-height: 0;
       display: inline-block;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434;
+        color: #ff3434;
       }
-      .micon2{
+      .micon2 {
         height: 26px;
         width: 38px;
         margin-left: 20px;
@@ -130,17 +128,17 @@
     }
   }
 }
-.title{
+.title {
   font-size: 28px;
   color: #202020;
   line-height: 60px;
   margin: 62px 0 10px 1px;
 }
-.spreadCard{
-  margin:0 10px 60px 10px;  
-  .card{
+.spreadCard {
+  margin: 0 10px 60px 10px;
+  .card {
     height: 166px;
-    background: #FFF;
+    background: #fff;
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 40px 0 43px 22px;
@@ -148,10 +146,10 @@
     color: #202020;
     box-sizing: border-box;
     position: relative;
-    .spreadMoney{
+    .spreadMoney {
       line-height: 60px;
     }
-    .spreadImg{
+    .spreadImg {
       width: 105px;
       height: 100px;
       position: absolute;
@@ -160,10 +158,10 @@
     }
   }
 }
-.botton{
-  font-size: 28px;   
-  color: #C0C8D3;
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding:40px 0 100px 0;
+  padding: 40px 0 100px 0;
 }

src/pages/details/foodDetails/foodDetails.jsx

@@ -86,13 +86,7 @@ export default withLayout((props) => {
   const [AllextNum, setAllextNum] = useState(0);
   //指南当前页数
   const [epage, setepage] = useState(2);
-  const extendMore = () => {
-    setepage(epage + 1);
-    getExtendContent("shop", id, { pageNum: epage }).then((res) => {
-      setExtend([...extend, ...res.records]);
-      setNewextNum(newextNum + res.records.length);
-    });
-  };
+
   const openMap = () => {
     Taro.openLocation({
       longitude: log.current - 0,
@@ -120,7 +114,7 @@ export default withLayout((props) => {
         setNewpgNum(res.records.length);
         setAllpgNum(res.total);
       });
-      getExtendContent("shop", id).then((res) => {
+      getExtendContent("shop", id, { pageNum: 999 }).then((res) => {
         setExtend(res.records || []);
         setAllextNum(res.total);
         setNewextNum(res.records.length);
@@ -254,14 +248,7 @@ export default withLayout((props) => {
                   {(extend || []).map((item) => (
                     <Extend key={item.extId} item={item} />
                   ))}
-                  <view
-                    className='showMore'
-                    style={{ display: newextNum == AllextNum ? "none" : "" }}
-                    onClick={extendMore}
-                  >
-                    <view>查看更多</view>
-                    <image src={showMore} className='moreTip' />
-                  </view>
+
                 </view>
                 <view
                   className='botton'

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -79,7 +79,7 @@ export default withLayout((props) => {
           setRecommend(res2 || [])
         })
       })
-      getExtendContent('tourist', id).then((res) => {
+      getExtendContent('tourist', id, { pageNum: 99999 }).then((res) => {
         setExtend(res.records || [])
         setAllextNum(res.total)
         setNewextNum(res.records.length)
@@ -159,10 +159,7 @@ export default withLayout((props) => {
               <image src={titlejd} />景点介绍
             </view>
             {(extend || []).map((item) => <Extend item={item} />)}
-            <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
-              <view>点击查看更多</view>
-              <image src={showMore} className='moreTip' />
-            </view>
+
           </view>
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
             <view className='title'>

src/pages/index/tabs/Guide.jsx

@@ -64,7 +64,7 @@ export default (props) => {
   useDidShow(() => {
     goContent()
   })
-  
+
   const geiZy = () => {
     setLoading(true)
     getExtendContent('room', roomId, {
@@ -123,7 +123,7 @@ export default (props) => {
   const goRoomMap = () => {
     if (taRoomContent.location) {
       const [longitude, latitude] = taRoomContent.location.split(',').map(x => x - 0)
-      
+
       Taro.openLocation({
         longitude,
         latitude,

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -95,7 +95,7 @@ export default (props) => {
       <view>
       </view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
-      <view style={{ padding: '30rpx', height: '100%' }}>
+      <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
         <view className='storexx'>
           <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
           <view onClick={ShowMoldeOn} className='User-info-cutover'>

src/shop/components/ShopKeeper/shopKeeper.less

@@ -1,113 +1,113 @@
-.User-box-sths{
+.User-box-sths {
   display: flex;
-  margin: 40px 0  60px 0;
+  margin: 40px 0 60px 0;
   justify-content: space-around;
   flex-wrap: wrap;
-  .User-box-selectUser{
+  .User-box-selectUser {
     width: 100%;
     font-size: 32px;
     font-weight: bold;
     color: #202020;
     line-height: 32px;
-    margin: 60px 0 70px  0;
+    margin: 60px 0 70px 0;
     text-align: left;
   }
-  .User-box-tourist{
+  .User-box-tourist {
     display: inline-block;
-     .Ubs-tourist-image{
+    .Ubs-tourist-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-tourist-text{
+    .Ubs-tourist-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color: #999999;      
+      color: #999999;
     }
   }
-  .User-box-hotelBoss{
+  .User-box-hotelBoss {
     display: inline-block;
-    .Ubs-hotelBoss-image{
+    .Ubs-hotelBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-hotelBoss-text{
+    .Ubs-hotelBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
       color: #999999;
     }
   }
-  .User-box-shopBoss{
-    .Ubs-shopBoss-image{
+  .User-box-shopBoss {
+    .Ubs-shopBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-shopBoss-text{
+    .Ubs-shopBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color:#202020;
+      color: #202020;
     }
   }
-
 }
-.storexx{
+.storexx {
   text-align: center;
-  height: 342px;
-  background: #FFFFFF;
+  height: 300px;
+  background: #ffffff;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
-  padding: 50px 30px 64px 40px;
+  padding: 20px 30px 34px 40px;
+
   box-sizing: border-box;
-  .storeName{
+  .storeName {
     height: 26px;
     font-size: 28px;
     font-weight: bold;
     color: #202020;
-    margin-bottom:27px;
+    margin-bottom: 25px;
   }
-  .User-info-cutover{
+  .User-info-cutover {
     position: absolute;
     top: 60px;
     right: 60px;
-    .User-info-cutover-image{
+    .User-info-cutover-image {
       width: 36px;
       height: 36px;
     }
   }
-  .tip{
+  .tip {
     height: 23px;
     font-size: 24px;
     color: #666666;
-    margin-bottom: 48px;
+    margin-bottom: 25px;
   }
-  .sleft{
+  .sleft {
     float: left;
-    .lword{
+    .lword {
       height: 25px;
       font-size: 26px;
       color: #666666;
-      margin-bottom: 40px;      
+      margin-bottom: 25px;
       margin-left: 1px;
     }
-    .yearMoney{
+    .yearMoney {
       height: 30px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434
+        color: #ff3434;
       }
-      .micon{
+      .micon {
         width: 38px;
         height: 22px;
         margin-left: 19px;
       }
     }
   }
-  .line{
+  .line {
     width: 2px;
     height: 128px;
     border-right: 2px dotted #202020;
@@ -116,26 +116,26 @@
     left: calc(50% - 1px);
     display: block;
   }
-  .sright{
+  .sright {
     float: right;
     text-align: left;
-    .rword{
+    .rword {
       font-size: 26px;
       color: #666666;
-      margin: 0 1px 47px 0;
+      margin: 0 1px 27px 0;
       text-align: center;
     }
-    .monthMoney{
+    .monthMoney {
       height: 24px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
       line-height: 24px;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434;
+        color: #ff3434;
       }
-      .micon2{
+      .micon2 {
         width: 38px;
         height: 22px;
         margin-left: 23px;
@@ -145,8 +145,6 @@
   }
 }
 
-
-
 .index-tabs {
   width: 100%;
   height: 91px;
@@ -166,17 +164,16 @@
     font-size: 32px;
     font-weight: bold;
     color: #4c4c4c;
-    padding-top: 33px;
-    padding-bottom: 28px;
+    padding-top: 13px;
+    padding-bottom: 18px;
     border-bottom: 5px solid black;
   }
 }
 
-.botton{
-  font-size: 28px;   
-  color: #C0C8D3;
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding:40px 0 100px 0;
+  padding: 10px 0 40px 0;
 }
-

src/shop/components/Sparead/spreadMoney.jsx

@@ -55,7 +55,7 @@ export default (props) => {
     <view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
 
-      <view style={{ padding: '30rpx', height: '100%' }}>
+      <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
         <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
 
           <view className='storexx'>
@@ -70,7 +70,7 @@ export default (props) => {
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
                   <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon' src={isyear ? eyes :ceyes } onClick={handleYear} />
+                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
               <view className='line' />

src/shop/components/Sparead/spreadMoney.less

@@ -1,115 +1,114 @@
-.User-box-sths{
+.User-box-sths {
   display: flex;
-  margin: 40px 0  60px 0;
+  margin: 40px 0 60px 0;
   justify-content: space-around;
   flex-wrap: wrap;
-  .User-box-selectUser{
+  .User-box-selectUser {
     width: 100%;
     font-size: 32px;
     font-weight: bold;
     color: #202020;
     line-height: 32px;
-    margin: 60px 0 70px  0;
+    margin: 60px 0 70px 0;
     text-align: left;
   }
-  .User-box-tourist{
+  .User-box-tourist {
     display: inline-block;
 
-     .Ubs-tourist-image{
+    .Ubs-tourist-image {
       width: 86px;
       height: 86px;
-
     }
-    .Ubs-tourist-text{
+    .Ubs-tourist-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color: #999999;      
+      color: #999999;
     }
   }
-  .User-box-hotelBoss{
+  .User-box-hotelBoss {
     display: inline-block;
-    .Ubs-hotelBoss-image{
+    .Ubs-hotelBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-hotelBoss-text{
+    .Ubs-hotelBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
       color: #999999;
     }
   }
-  .User-box-shopBoss{
-    .Ubs-shopBoss-image{
+  .User-box-shopBoss {
+    .Ubs-shopBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-shopBoss-text{
+    .Ubs-shopBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color:#202020;
+      color: #202020;
     }
   }
-
 }
-.storexx{
+.storexx {
   text-align: center;
-  height: 342px;
-  background: #FFFFFF;
+  height: 300px;
+  background: #ffffff;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
-  padding: 50px 30px 64px 40px;
+  padding: 20px 30px 34px 40px;
+
   box-sizing: border-box;
-  .storeName{
+  .storeName {
     height: 26px;
     font-size: 28px;
     font-weight: bold;
     color: #202020;
-    margin-bottom:27px;
+    margin-bottom: 27px;
   }
-  .User-info-cutover{
+  .User-info-cutover {
     position: absolute;
     top: 60px;
     right: 60px;
-    .User-info-cutover-image{
+    .User-info-cutover-image {
       width: 36px;
       height: 36px;
     }
   }
-  .tip{
+  .tip {
     height: 23px;
     font-size: 24px;
     color: #666666;
     margin-bottom: 48px;
   }
-  .sleft{
+  .sleft {
     float: left;
-    .lword{
+    .lword {
       height: 25px;
       font-size: 26px;
       color: #666666;
-      margin-bottom: 40px;      
+      margin-bottom: 40px;
       margin-left: 1px;
     }
-    .yearMoney{
+    .yearMoney {
       height: 30px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434
+        color: #ff3434;
       }
-      .micon{
+      .micon {
         width: 38px;
         height: 22px;
         margin-left: 19px;
       }
     }
   }
-  .line{
+  .line {
     width: 2px;
     height: 128px;
     border-right: 2px dotted #202020;
@@ -118,26 +117,26 @@
     left: calc(50% - 1px);
     display: block;
   }
-  .sright{
+  .sright {
     float: right;
     text-align: left;
-    .rword{
+    .rword {
       font-size: 26px;
       color: #666666;
       margin: 0 1px 47px 0;
       text-align: center;
     }
-    .monthMoney{
+    .monthMoney {
       height: 24px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
       line-height: 24px;
-      text{
+      text {
         font-size: 40px;
-        color: #FF3434;
+        color: #ff3434;
       }
-      .micon2{
+      .micon2 {
         width: 38px;
         height: 22px;
         margin-left: 23px;
@@ -146,17 +145,17 @@
     }
   }
 }
-.title{
+.title {
   font-size: 28px;
   color: #202020;
   line-height: 60px;
   margin: 62px 0 10px 1px;
 }
 
-.botton{
-  font-size: 28px;   
-  color: #C0C8D3;
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding:40px 0 100px 0;
+  padding: 40px 0 100px 0;
 }