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

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.js

@@ -15,12 +15,12 @@ Component({
   methods: {
     onClose(){
       if(this.isUse) return;
-      this.isUse = false;
+      this.isUse = true;
       setTimeout(()=>{
           if(this){
-              this.isUse = true;
+              this.isUse = false;
           }
-      })
+      },600)
       const {onClose} = this.props;
       onClose&&onClose();
     },

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

@@ -250,8 +250,8 @@
   color: #000000;
 }
 .pageindex .rule {
-  width: 42rpx;
-  height: 135rpx;
+  width: 48rpx;
+  height: 145rpx;
   opacity: 1;
   top: 130rpx;
   position: absolute;

taobao_jn/client/pages/pagepagerank/pagepagerank.axml

 <view class="pagerank ">
-        <image class="rankbg " src={{resList['bf292c37-4753-46bc-bae5-e886ae9cec80'].url}} />
+        <image class="rankbg " src={{resList['b4d591f8-3459-49c9-9ddc-3d80afb7babd'].url}} />
         <image class="rankreturnbtn btn" onTap="navigateToIndex" src={{resList['071da23d-ca97-4979-91d1-533fe386eef7'].url}} />
         <view class="ranktex ">
         <label class="prizeTips ">右滑查看更多奖品</label>

taobao_jn/client/resconfig/resList.js

@@ -620,13 +620,13 @@ const resList = {
         url: '//yun.duiba.com.cn/spark/assets/rankPageBg.8b9986cb40ee53236566ea9ade005f6cc5164467.png',
         uuid: 'bf292c37-4753-46bc-bae5-e886ae9cec80'
       },
-      'af0fe4d0-011d-4822-96e0-03198626f23d-1': {
+      'af0fe4d0-011d-4822-96e0-03198626f23d-2': {
         name: 'rankListItem1111',
         ext: '.png',
         url: '//yun.duiba.com.cn/spark/assets/rankListItem1111.05783f4a9562c170034e8c5e86aa4ecc15e072d7.png',
         uuid: 'af0fe4d0-011d-4822-96e0-03198626f23d'
       },
-      'af0fe4d0-011d-4822-96e0-03198626f23d-2': {
+      'af0fe4d0-011d-4822-96e0-03198626f23d-1': {
         name: 'rankListItem2222',
         ext: '.png',
         url: '//yun.duiba.com.cn/spark/assets/rankListItem2222.b3d16c471ad68d40fc14b2b4027881386f38db3c.png',
@@ -746,5 +746,11 @@ const resList = {
         url: '//yun.duiba.com.cn/spark/assets/lockBattle7.8f125a5cfd6e2258e7424df340c7b6eaf0a2bbf1.png',
         uuid: 'edc11c83-81db-4bb6-9ebd-0a276ff36fa0'
       },
+      'b4d591f8-3459-49c9-9ddc-3d80afb7babd': {
+        name: 'rankPageFinal',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/rankPageFinal.f6c5990ccbcc0ebca410570153441448d439ff31.png',
+        uuid: 'b4d591f8-3459-49c9-9ddc-3d80afb7babd'
+      },
 };
 export default resList;
\ No newline at end of file