浏览代码

Merge branch 'dev' of https://github.com/jdf2e/nutui into dev

franslee 7 年之前
父节点
当前提交
33ca566b30
共有 4 个文件被更改,包括 631 次插入3 次删除
  1. 0 1
      package.json
  2. 627 0
      src/package/qrcode/src/qrcode.js
  3. 1 1
      src/package/qrcode/src/qrcode.vue
  4. 3 1
      src/package/swiper/src/swiper.vue

+ 0 - 1
package.json

@@ -59,7 +59,6 @@
     "inquirer": "^5.2.0",
     "node-sass": "^4.8.3",
     "postcss-loader": "^2.0.6",
-    "qrcodejs2": "0.0.2",
     "rimraf": "^2.6.2",
     "sass-loader": "^6.0.6",
     "style-loader": "^0.18.2",

文件差异内容过多而无法显示
+ 627 - 0
src/package/qrcode/src/qrcode.js


+ 1 - 1
src/package/qrcode/src/qrcode.vue

@@ -4,7 +4,7 @@
     </div>
 </template>
 <script>
-import QRCode from 'qrcodejs2'
+import QRCode from './qrcode.js';
 export default {
     name:'nut-qrcode',
     props: {

+ 3 - 1
src/package/swiper/src/swiper.vue

@@ -336,7 +336,9 @@ export default {
             let selectedSlide = this.$el.querySelector('.nut-swiper-silde-selected');
             selectedSlide && selectedSlide.classList.remove('nut-swiper-silde-selected');
             this.slideEls[this.currentPage-1].classList.add('nut-swiper-silde-selected');
-
+            if(this.loop){
+                 this._setTranslate(this._getTranslateOfPage(this.currentPage));
+            }
             this.stopAutoPlay = false;
         },
         _isPageChanged(){