diff --git a/ers18477Desktopmodemode; git remote -v b/ers18477Desktopmodemode; git remote -v new file mode 100644 index 0000000..7e003f0 --- /dev/null +++ b/ers18477Desktopmodemode; git remote -v @@ -0,0 +1,134 @@ + Main + New2 + Swt +* Xfy + mian_ly + remotes/mini-program/HEAD -> mini-program/Xfy + remotes/mini-program/Xfy + remotes/mini-program/xxfy + remotes/new-origin/AI + remotes/new-origin/Backup + remotes/new-origin/HEAD -> new-origin/master + remotes/new-origin/Ly + remotes/new-origin/Main + remotes/new-origin/New + remotes/new-origin/New2 + remotes/new-origin/SSSSS + remotes/new-origin/Swt + remotes/new-origin/Xfy + remotes/new-origin/fff + remotes/new-origin/index + remotes/new-origin/master + remotes/new-origin/mian_ly + remotes/new-origin/new2-branch + remotes/new-origin/wechat + remotes/new-origin/wxss + remotes/new-origin/xxfy + remotes/new-origin/xxx + remotes/new-origin/首页样式最新 + remotes/new-repo/AI + remotes/new-repo/Backup + remotes/new-repo/HEAD -> new-repo/master + remotes/new-repo/Main + remotes/new-repo/Main2 + remotes/new-repo/New + remotes/new-repo/New2 + remotes/new-repo/SSSSS + remotes/new-repo/Swt + remotes/new-repo/Xfy + remotes/new-repo/fff + remotes/new-repo/index + remotes/new-repo/main_ly + remotes/new-repo/master + remotes/new-repo/mian_ly + remotes/new-repo/new2-branch + remotes/new-repo/wechat + remotes/new-repo/wxss + remotes/new-repo/xxx + remotes/new-repo/首页样式最新 + remotes/origin/AI + remotes/origin/Backup + remotes/origin/HEAD -> origin/master + remotes/origin/Ly + remotes/origin/Main + remotes/origin/New + remotes/origin/New2 + remotes/origin/SSSSS + remotes/origin/Swt + remotes/origin/Xfy + remotes/origin/fff + remotes/origin/index + remotes/origin/master + remotes/origin/mian_ly + remotes/origin/new2-branch + remotes/origin/wechat + remotes/origin/wxss + remotes/origin/xxx + remotes/origin/首页样式最新 + Main + New2 + Swt +* Xfy + mian_ly + remotes/mini-program/HEAD -> mini-program/Xfy + remotes/mini-program/Xfy + remotes/mini-program/xxfy + remotes/new-origin/AI + remotes/new-origin/Backup + remotes/new-origin/HEAD -> new-origin/master + remotes/new-origin/Ly + remotes/new-origin/Main + remotes/new-origin/New + remotes/new-origin/New2 + remotes/new-origin/SSSSS + remotes/new-origin/Swt + remotes/new-origin/Xfy + remotes/new-origin/fff + remotes/new-origin/index + remotes/new-origin/master + remotes/new-origin/mian_ly + remotes/new-origin/new2-branch + remotes/new-origin/wechat + remotes/new-origin/wxss + remotes/new-origin/xxfy + remotes/new-origin/xxx + remotes/new-origin/首页样式最新 + remotes/new-repo/AI + remotes/new-repo/Backup + remotes/new-repo/HEAD -> new-repo/master + remotes/new-repo/Main + remotes/new-repo/Main2 + remotes/new-repo/New + remotes/new-repo/New2 + remotes/new-repo/SSSSS + remotes/new-repo/Swt + remotes/new-repo/Xfy + remotes/new-repo/fff + remotes/new-repo/index + remotes/new-repo/main_ly + remotes/new-repo/master + remotes/new-repo/mian_ly + remotes/new-repo/new2-branch + remotes/new-repo/wechat + remotes/new-repo/wxss + remotes/new-repo/xxx + remotes/new-repo/首页样式最新 + remotes/origin/AI + remotes/origin/Backup + remotes/origin/HEAD -> origin/master + remotes/origin/Ly + remotes/origin/Main + remotes/origin/New + remotes/origin/New2 + remotes/origin/SSSSS + remotes/origin/Swt + remotes/origin/Xfy + remotes/origin/fff + remotes/origin/index + remotes/origin/master + remotes/origin/mian_ly + remotes/origin/new2-branch + remotes/origin/wechat + remotes/origin/wxss + remotes/origin/xxx + remotes/origin/首页样式最新 diff --git a/images/1.jpg b/images/1.jpg new file mode 100644 index 0000000..1a1a832 Binary files /dev/null and b/images/1.jpg differ diff --git a/images/1.png b/images/1.png deleted file mode 100644 index 469ddfb..0000000 Binary files a/images/1.png and /dev/null differ diff --git a/images/2.jpg b/images/2.jpg new file mode 100644 index 0000000..79bfb8e Binary files /dev/null and b/images/2.jpg differ diff --git a/images/2.png b/images/2.png deleted file mode 100644 index 0c6e207..0000000 Binary files a/images/2.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index 367a380..1869f30 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -647,13 +647,7 @@ Page({ } else if (adData.adType === 'half_image') { console.log('半高图片广告被点击') } - } else { - wx.showToast({ - title: '广告加载中', - icon: 'loading', - duration: 1500 - }) - } + } }, // 加载商品分类列表 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4c3b960..bcaae89 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -162,7 +162,7 @@