Skip to content

梁建民 / h5

Go to a project
Commit b6125f72 by 施宇
Options

Merge branch 'lt_yaohaoyou' into Development 

# Conflicts:
#	view/11.js
parents 5f27ba4e 718fb0de
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/views/oscilloscope/Index.vue
......@@ -117,7 +117,7 @@ export default {
meaushow: true,
bgcolor: "#fafafa",
animate:false,
shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/?invitedId='+util.getCookie("Yo4teW_uid")):"#/")
shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/oscilloscope?invitedId='+util.getCookie("Yo4teW_uid")):"#/oscilloscope")
};
},
created(){
......
view/10.js
......@@ -20,7 +20,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es7.object.get-own-property-descriptors */ \"./node_modules/_core-js@2.6.11@core-js/modules/es7.object.get-own-property-descriptors.js\");\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/web.dom.iterable */ \"./node_modules/_core-js@2.6.11@core-js/modules/web.dom.iterable.js\");\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es6.array.iterator */ \"./node_modules/_core-js@2.6.11@core-js/modules/es6.array.iterator.js\");\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es6.object.keys */ \"./node_modules/_core-js@2.6.11@core-js/modules/es6.object.keys.js\");\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/defineProperty */ \"./node_modules/_@babel_runtime@7.10.2@@babel/runtime/helpers/esm/defineProperty.js\");\n/* harmony import */ var _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/views/common/Header.vue */ \"./src/views/common/Header.vue\");\n/* harmony import */ var _util_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../util/index */ \"./src/util/index.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.4.0@vuex/dist/vuex.esm.js\");\n/* harmony import */ var _views_common_wxShare_vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @/views/common/wxShare.vue */ \"./src/views/common/wxShare.vue\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.11@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.8.4@vant/es/index.js\");\n\n\n\n\n\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { Object(E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_9__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_10__[\"Swipe\"]).use(vant__WEBPACK_IMPORTED_MODULE_10__[\"SwipeItem\"]);\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"oscilloscope\",\n data: function data() {\n return {\n title: \"\",\n meaushow: true,\n bgcolor: \"#fafafa\",\n animate: false,\n shareUrl: window.location.origin + window.location.pathname + (_util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\") ? '#/?invitedId=' + _util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\") : \"#/\")\n };\n },\n created: function created() {\n this.oscilloscopeinvited();\n this.getBannerData();\n this.yaoHaoYouJP();\n this.getYaoHaoYouGoodId();\n },\n computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_7__[\"mapState\"])({\n bannerData: function bannerData(state) {\n return state.oscilloscope.bannerData;\n },\n isLodingFinishData: function isLodingFinishData(state) {\n return state.oscilloscope.isLodingFinishData;\n },\n prizeData: function prizeData(state) {\n return state.oscilloscope.prizeData;\n },\n goodId: function goodId(state) {\n return state.oscilloscope.goodId;\n }\n })),\n watch: {\n isLodingFinishData: function isLodingFinishData(now) {\n var me = this;\n\n if (now) {\n setInterval(this.showMarquee, 2000);\n }\n }\n },\n methods: _objectSpread(_objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_7__[\"mapMutations\"])(['changeBannerData'])), {}, {\n getYaoHaoYouGoodId: function getYaoHaoYouGoodId() {\n //获取商品id\n this.$store.dispatch({\n type: \"getYaoHaoYouGoodId\",\n data: {\n \"type_id\": 1\n }\n });\n },\n yaoHaoYouJP: function yaoHaoYouJP() {\n //获取奖品信息\n this.$store.dispatch({\n type: \"yaoHaoYouJP\"\n });\n },\n showMarquee: function showMarquee() {\n var _this = this;\n\n this.animate = true;\n setTimeout(function () {\n _this.changeBannerData();\n\n _this.animate = false;\n }, 500);\n },\n oscilloscopeinvited: function oscilloscopeinvited() {\n var invitedId = this.$route.query.invitedId;\n var userId = _util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\");\n var data = {};\n\n if (invitedId) {\n SetCookie('sbqinvitedId', invitedId, 1);\n data['invited_uid'] = invitedId;\n } else {\n getCookie('sbqinvitedId') && (data['user_id '] = getCookie('sbqinvitedId'));\n }\n\n userId && (data['user_id '] = userId); //统计邀请的人数和页面访问统计\n\n this.$store.dispatch({\n type: \"oscilloscopeinvited\",\n data: _objectSpread({}, data)\n });\n },\n getBannerData: function getBannerData() {\n //获取广告文字轮播\n this.$store.dispatch({\n type: \"getbannerdata\",\n data: {\n 'is_liexin': 1\n }\n });\n },\n buyFun: function buyFun() {\n var _this2 = this;\n\n //立即购买\n this.judgeLogin(function () {\n if (!_this2.goodId) {\n return;\n }\n\n var datax = {\n id: _this2.goodId,\n num: 1,\n buy: 1\n };\n\n _this2.$store.dispatch({\n type: \"addGoods\",\n data: {\n datax: datax\n }\n });\n });\n },\n judgeLogin: function judgeLogin(callback) {\n if (_util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].isLogin() == 1) {\n //已登入\n callback();\n } else {\n //未登入\n window.location.href = '/v3/login?referer=' + encodeURIComponent(window.location.href) + '&ptag=oscilloscope';\n }\n }\n }),\n components: {\n Header: _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_5__[\"default\"],\n wxShare: _views_common_wxShare_vue__WEBPACK_IMPORTED_MODULE_8__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/oscilloscope/Index.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.1.0@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.9.2@vue-loader/lib??vue-loader-options");
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es7.object.get-own-property-descriptors */ \"./node_modules/_core-js@2.6.11@core-js/modules/es7.object.get-own-property-descriptors.js\");\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/web.dom.iterable */ \"./node_modules/_core-js@2.6.11@core-js/modules/web.dom.iterable.js\");\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es6.array.iterator */ \"./node_modules/_core-js@2.6.11@core-js/modules/es6.array.iterator.js\");\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es6.object.keys */ \"./node_modules/_core-js@2.6.11@core-js/modules/es6.object.keys.js\");\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/defineProperty */ \"./node_modules/_@babel_runtime@7.10.2@@babel/runtime/helpers/esm/defineProperty.js\");\n/* harmony import */ var _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/views/common/Header.vue */ \"./src/views/common/Header.vue\");\n/* harmony import */ var _util_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../util/index */ \"./src/util/index.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.4.0@vuex/dist/vuex.esm.js\");\n/* harmony import */ var _views_common_wxShare_vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @/views/common/wxShare.vue */ \"./src/views/common/wxShare.vue\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.11@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.8.4@vant/es/index.js\");\n\n\n\n\n\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { Object(E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_9__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_10__[\"Swipe\"]).use(vant__WEBPACK_IMPORTED_MODULE_10__[\"SwipeItem\"]);\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"oscilloscope\",\n data: function data() {\n return {\n title: \"\",\n meaushow: true,\n bgcolor: \"#fafafa\",\n animate: false,\n shareUrl: window.location.origin + window.location.pathname + (_util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\") ? '#/oscilloscope?invitedId=' + _util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\") : \"#/oscilloscope\")\n };\n },\n created: function created() {\n this.oscilloscopeinvited();\n this.getBannerData();\n this.yaoHaoYouJP();\n this.getYaoHaoYouGoodId();\n },\n computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_7__[\"mapState\"])({\n bannerData: function bannerData(state) {\n return state.oscilloscope.bannerData;\n },\n isLodingFinishData: function isLodingFinishData(state) {\n return state.oscilloscope.isLodingFinishData;\n },\n prizeData: function prizeData(state) {\n return state.oscilloscope.prizeData;\n },\n goodId: function goodId(state) {\n return state.oscilloscope.goodId;\n }\n })),\n watch: {\n isLodingFinishData: function isLodingFinishData(now) {\n var me = this;\n\n if (now) {\n setInterval(this.showMarquee, 2000);\n }\n }\n },\n methods: _objectSpread(_objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_7__[\"mapMutations\"])(['changeBannerData'])), {}, {\n getYaoHaoYouGoodId: function getYaoHaoYouGoodId() {\n //获取商品id\n this.$store.dispatch({\n type: \"getYaoHaoYouGoodId\",\n data: {\n \"type_id\": 1\n }\n });\n },\n yaoHaoYouJP: function yaoHaoYouJP() {\n //获取奖品信息\n this.$store.dispatch({\n type: \"yaoHaoYouJP\"\n });\n },\n showMarquee: function showMarquee() {\n var _this = this;\n\n this.animate = true;\n setTimeout(function () {\n _this.changeBannerData();\n\n _this.animate = false;\n }, 500);\n },\n oscilloscopeinvited: function oscilloscopeinvited() {\n var invitedId = this.$route.query.invitedId;\n var userId = _util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].getCookie(\"Yo4teW_uid\");\n var data = {};\n\n if (invitedId) {\n SetCookie('sbqinvitedId', invitedId, 1);\n data['invited_uid'] = invitedId;\n } else {\n getCookie('sbqinvitedId') && (data['user_id '] = getCookie('sbqinvitedId'));\n }\n\n userId && (data['user_id '] = userId); //统计邀请的人数和页面访问统计\n\n this.$store.dispatch({\n type: \"oscilloscopeinvited\",\n data: _objectSpread({}, data)\n });\n },\n getBannerData: function getBannerData() {\n //获取广告文字轮播\n this.$store.dispatch({\n type: \"getbannerdata\",\n data: {\n 'is_liexin': 1\n }\n });\n },\n buyFun: function buyFun() {\n var _this2 = this;\n\n //立即购买\n this.judgeLogin(function () {\n if (!_this2.goodId) {\n return;\n }\n\n var datax = {\n id: _this2.goodId,\n num: 1,\n buy: 1\n };\n\n _this2.$store.dispatch({\n type: \"addGoods\",\n data: {\n datax: datax\n }\n });\n });\n },\n judgeLogin: function judgeLogin(callback) {\n if (_util_index__WEBPACK_IMPORTED_MODULE_6__[\"default\"].isLogin() == 1) {\n //已登入\n callback();\n } else {\n //未登入\n window.location.href = '/v3/login?referer=' + encodeURIComponent(window.location.href) + '&ptag=oscilloscope';\n }\n }\n }),\n components: {\n Header: _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_5__[\"default\"],\n wxShare: _views_common_wxShare_vue__WEBPACK_IMPORTED_MODULE_8__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/oscilloscope/Index.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.1.0@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.9.2@vue-loader/lib??vue-loader-options");
/***/ }),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment