Authored by 王水玲

Merge remote-tracking branch 'origin/master' into feature/fashion-detail

... ... @@ -9,7 +9,10 @@
<div class="products">
<Products></Products>
</div>
<div class="share"></div>
<div class="share">
<WidgetIconBtn type="msg"></WidgetIconBtn>
<WidgetIconBtn type="zan"></WidgetIconBtn>
</div>
</div>
</div>
</template>
... ...
... ... @@ -34,7 +34,7 @@ import {Slide} from 'cube-ui';
import AvatarHeader from './avatar-header';
import DescFooter from './desc-footer';
const img = require('statics/image/showorder/test.png')
// const img = require('statics/image/showorder/test.png')
export default {
name: 'ShowOrderItem',
... ... @@ -50,9 +50,7 @@ export default {
'https://wx1.sinaimg.cn/mw1024/686d7361ly1fpha0mpd5uj21hc0tyws2.jpg',
'https://wx1.sinaimg.cn/mw1024/686d7361ly1fpha0ncnnej21hc0zetxo.jpg',
'https://wx1.sinaimg.cn/mw1024/686d7361ly1fpha0mqvu5j21hc0zkgzz.jpg',
img.toString()
],
currentPageIndex: 0,
slideOptions: {
listenScroll: true,
... ... @@ -60,8 +58,7 @@ export default {
click: false,
directionLockThreshold: 0,
stopPropagation: true
},
testimg: img
}
};
},
methods: {
... ...