提交代码，地址为服务器地址

71a516ab · ChenXianbin · 0ce7eb3a · 71a516ab · 71a516ab · 71a516ab
Commit 71a516ab authored Jun 13, 2018 by ChenXianbin
8 changed files
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -49,15 +49,15 @@ module.exports = {
  },
  module: {
    rules: [
-      {
-        test: /\.(js|vue)$/,
-        loader: 'eslint-loader',
-        enforce: 'pre',
-        include: [resolve('src'), resolve('test')],
-        options: {
-          formatter: require('eslint-friendly-formatter')
-        }
-      },
+      // {
+      //   test: /\.(js|vue)$/,
+      //   loader: 'eslint-loader',
+      //   enforce: 'pre',
+      //   include: [resolve('src'), resolve('test')],
+      //   options: {
+      //     formatter: require('eslint-friendly-formatter')
+      //   }
+      // },
      {
        test: /\.vue$/,
        loader: 'mpvue-loader',

--- a/index.html
+++ b/index.html
@@ -4,8 +4,8 @@
    <meta charset="utf-8">
    <title>mpvue_quickstart</title>
  </head>
-  <body>
-    <div id="app"></div>
+  <body style="width:100%;height:100%">
+    <div id="app" style="width:100%;height:100%"></div>
    <!-- built files will be auto injected -->
  </body>
 </html>
--- a/src/assets/img/assit_line.png
+++ b/src/assets/img/assit_line.png
--- a/src/assets/img/bg.jpg
+++ b/src/assets/img/bg.jpg
--- a/src/pages/counter/index.vue
+++ b/src/pages/counter/index.vue
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
 <template>
-  <div class="index-page">
-    <img src="../../assets/img/index-bg.jpg" class="index-bg"/>
+  <div class="index-page" v-bind:style="{ paddingTop: isActive[0]+25*isActive[1] + 'rpx'}">
+    <p class="navigator_text" v-bind:style="{ top: isActive[0]-4*isActive[1]+ 'rpx'}">我的手机</p>
+    <img src="../../assets/img/index-bg.jpg" class="index-bg" />
    <img src="../../assets/img/index-bg-cover.png" class="index-bg-cover" />
-    <img src="../../assets/img/index-start-button.jpg" class="index-start-button" @click="handleStart"/>
-    <!-- <navigator
-    v-if="config.more_fun && !config.more_fun.hide"
-    class="navigator"
-    path=""
-    target="miniProgram" open-type="navigate" :app-id="config.more_fun.appid" > -->
-    <img src="../../assets/img/btn-more.png" class="btn-more" @tap="handleMore" v-if="config.more_fun && !config.more_fun.hide" />
-    <!-- </navigator> -->
+    <img src="../../assets/img/index-start-button.jpg" class="index-start-button" @click="handleStart" />
+    <navigator v-if="config.more_fun && !config.more_fun.hide" class="navigator" path="" target="miniProgram" open-type="navigate" :app-id="config.more_fun.appid">
+      <img src="../../assets/img/btn-more.png" class="btn-more" @tap="handleMore" v-if="config.more_fun && !config.more_fun.hide" />
+    </navigator>
  </div>
 </template>

@@ -19,45 +16,66 @@ export default {
  computed: {
    config() {
      return store.state.indexPage.config
+    },
+    isActive() {
+      console.warn('show')
+      let height = 0,pixelRatio=1;
+      wx.getSystemInfo({
+        success: res => {
+          this.pageStyle = 'padding-top:' + res.statusBarHeight + 'rpx'
+          console.warn(res.statusBarHeight)
+          console.warn(res.pixelRatio)
+          // res.pixelRatio
+          height = res.statusBarHeight*res.pixelRatio;
+          pixelRatio = res.pixelRatio
+        }
+      })
+      return [height,pixelRatio];
    }
  },
-  onLoad () {
-    console.log(this.$root.$mp.query, this.$root.$mp.appOptions, this.$root.$mp)
+  onLoad() {
+    // console.log(
+    //   this.$root.$mp.query,
+    //   this.$root.$mp.appOptions,
+    //   this.$root.$mp
+    // );
  },
-  onPageScroll () {
-    console.log('page is scroll')
+  onShow() {},
+  onPageScroll() {
+    // console.log('page is scroll')
  },
-  beforeCreate () {
-    console.log('page is before create')
+  beforeCreate() {
+    // console.log('page is before create')
  },
-  data () {
+  data() {
    return {
      userInfo: {}
    }
  },

-  components: {
-  },
+  components: {},

  methods: {
    handleStart() {
+      wx.setStorageSync('commited', false)
      wx.navigateTo({
        url: '/pages/counter/main'
      })
    },
    handleMore() {
+      return false
      wx.navigateToMiniProgram({
        appId: this.config.more_fun.appid,
        path: '',
        success() {
-          console.log('打开成功')
+          // console.log("打开成功");
        }
      })
    }
  },

-  created () {
-  }
+  created() {},
+  mounted() {}
 }
 </script>

@@ -69,6 +87,7 @@ export default {
  background: #c9baa8;
  text-align: center;
  padding: 30rpx 0 0;
+  padding-top: 160rpx;
 }
 .index-bg {
  position: absolute;
@@ -96,4 +115,18 @@ export default {
  height: 123rpx;
  z-index: 4;
 }
+.navigator {
+  opacity: 1;
+  background: rgba(0, 0, 0, 0);
+}
+.navigator_text {
+  text-align: center;
+  font-size: 40rpx;
+  color: #555555;
+  position: fixed;
+  top: 60rpx;
+  font-family: 'Microsoft Yahei';
+  width: 100%;
+  z-index: 100;
+}
 </style>
--- a/src/pages/logs/index.vue
+++ b/src/pages/logs/index.vue
--- a/src/request.js
+++ b/src/request.js
@@ -11,8 +11,8 @@ function setAuthorization (header) {
  Authorization = header
 }
 const log = console.log
+// fly.config.baseURL = 'https://minigame.api.wxagame.com/game-mobile/api/v1/'
 fly.config.baseURL = 'https://test-api.wxagame.com/game-mobile/api/v1/'
-
 // add token
 fly.interceptors.request.use((config, promise) => {
  log(config, 'request config')