Merge branch 'jiaoneiqunuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into jiaoneiqunuan

taobao_jn/client/components/comranknoprizemodal/comranknoprizemodal.axml

@@ -2,9 +2,9 @@
         <image class="ranknoprizebg " src={{resList['ae93d0a2-7c8b-48a5-96a2-49b819e5b2bf'].url}} />
         <!-- <label class="ranknoprizeindex ">500+</label> -->
         <image class="ranknoprize500 " a:if="{{myRank>500}}" src={{resList['14fbf7c8-43e2-4bb9-81c8-d1392455cf39'].url}} />
-        <image class="rankNoPirzeHundred " a:if="{{myRank<=500}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankHundred)].url}} />
-        <image class="rankNoPirzeTen " a:if="{{myRank<=500}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankTen)].url}} />
-        <image class="rankNoPirzeOne " a:if="{{myRank<=500}}" style="{{{'left':oneLeft}}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankOne)].url}} />
+        <image class="rankNoPirzeHundred " a:if="{{myRank<=500&&myRankHundred>0}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankHundred)].url}} />
+        <image class="rankNoPirzeTen " a:if="{{myRank<=500&&myRankTen>=0&&myRankHundred<0}}" style="{{{'left':tenLeft+'rpx'}}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankTen)].url}} />
+        <image class="rankNoPirzeOne " a:if="{{myRank<=500&&myRankOne>=0}}" style="{{{'left':oneLeft+'rpx'}}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankOne)].url}} />
         <image class="ranknoprizebtn btn" onTap="onCloseModal" src={{resList['d0c616aa-c606-40dd-b6f1-e9d370f3d053'].url}} />
         <image class="ranknoprizeclose btn" onTap="onCloseModal" src={{resList['843f7959-252d-403d-8287-e212b46b1fc1'].url}} />
 </view> 
\ No newline at end of file

taobao_jn/client/components/comranknoprizemodal/comranknoprizemodal.js

@@ -3,7 +3,7 @@
 import resList from '../../resconfig/resList';
 Component({
   props: {
-      gameInfo:{rank:156}
+      gameInfo:{rank:10}
   },
   data: {
     resList: resList,
@@ -31,7 +31,12 @@ Component({
     console.log("排名",hundred,ten,one)
     if(ten<=0){
         this.setData({
-            oneLeft:'222rpx'
+            oneLeft:222
+        })
+    }else if(hundred<=0&&ten>0){
+        this.setData({
+            oneLeft:260,
+            tenLeft:164
         })
     }
     this.setData({

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -17,8 +17,8 @@ const {
     navigateToOutside,
     getSystemInfo
 } = tbcc.tb;
-const snowSrc = "cloud://A261ECB81B02B03525F9150249E43073//snow.svga";
-const fireSrc = "cloud://7C78D5F72134804930A61B03665091AF//fire.svga"
+const snowSrc = "cloud://B975D7429522C2AA89E6FD651523DC57//snow.svga";
+const fireSrc = "cloud://F03F0071205084B1A58F9C560010C076//fire.svga"
 const checkSystem = async () => {
     const {
         version