Merge branch 'dev/v4.8.93_cyl' of qmx/jy into feature/v4.8.93

src/jfw/modules/app/src/web/templates/me/appVersion.html

@@ -119,7 +119,7 @@
             computed:{
               appVersion: function () {
                 if (this.curVersion) {
-                  return 'V' + this.curVersion
+                  return this.curVersion
                 } else {
                   return ''
                 }

src/web/templates/pc/template/index/activity-dialog.html

@@ -32,12 +32,6 @@
     if (ADList.length>0){
       for (var i=0;i<ADList.length;i++ ){
         var AD=ADList[i]
-        if(AD.s_link){
-          adv_url = AD.s_link
-        }
-        if(AD.s_pic){
-          adv_img = AD.s_pic
-        }
         if (AD.o_extend != undefined) {
           var nowTime = new Date().getTime();
           if (AD.o_extend.startTime!=undefined){
@@ -74,6 +68,12 @@
             adv_background_opacity = AD.o_extend.opacity;
           }
         }
+        if(AD.s_link){
+          adv_url = AD.s_link
+        }
+        if(AD.s_pic){
+          adv_img = AD.s_pic
+        }
         if (adv_img!=""){
           $(".tc_button").remove();
           let isSupportFull = false