Przeglądaj źródła

页面改版前备份

guhongwei 2 lat temu
rodzic
commit
12431179a8
34 zmienionych plików z 1049 dodań i 349 usunięć
  1. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  2. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  3. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map
  6. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/prize/index.js.map
  7. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/video/index.js.map
  8. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/video/info.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  10. 3 1
      unpackage/dist/dev/mp-weixin/app.json
  11. 68 2
      unpackage/dist/dev/mp-weixin/common/main.js
  12. 34 7
      unpackage/dist/dev/mp-weixin/common/vendor.js
  13. 15 15
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  14. 17 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  15. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  16. 4 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  17. 1 1
      unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js
  18. 7 157
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.js
  19. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml
  20. 3 62
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxss
  21. 0 1
      unpackage/dist/dev/mp-weixin/pagesHome/home/video.wxml
  22. 137 78
      unpackage/dist/dev/mp-weixin/pagesHome/home/video.js
  23. 5 0
      unpackage/dist/dev/mp-weixin/pagesHome/prize/index.json
  24. 1 0
      unpackage/dist/dev/mp-weixin/pagesHome/prize/index.wxml
  25. 27 0
      unpackage/dist/dev/mp-weixin/pagesHome/prize/index.wxss
  26. 384 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/index.js
  27. 5 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/index.json
  28. 1 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/index.wxml
  29. 74 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/index.wxss
  30. 236 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/info.js
  31. 0 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/info.json
  32. 1 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/info.wxml
  33. 0 0
      unpackage/dist/dev/mp-weixin/pagesHome/video/info.wxss
  34. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/prize/index.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/video/index.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/video/info.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


+ 3 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -13,7 +13,9 @@
       "root": "pagesHome",
       "pages": [
         "home/index",
-        "home/video"
+        "video/index",
+        "video/info",
+        "prize/index"
       ]
     }
   ],

+ 68 - 2
unpackage/dist/dev/mp-weixin/common/main.js

@@ -101,14 +101,80 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = {};
+var _default = {
+  data: function data() {
+    return {};
+  },
+  onLoad: function onLoad() {},
+  onShow: function onShow() {},
+  onLaunch: function onLaunch() {
+    var that = this;
+    that.checkVersion();
+  },
+  methods: {
+    // 检查版本
+    checkVersion: function checkVersion() {
+      var _this = this;
+      var that = this;
+      plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
+        uni.request({
+          url: "".concat(that.$config.serverUrl, "/files/project/appVersion.json"),
+          method: 'GET',
+          success: function success(res) {
+            if (wgtinfo.version === res.data.version) return;
+            uni.showModal({
+              title: '更新',
+              content: "有新版本,是否下载?",
+              success: function success(oneres) {
+                if (oneres.confirm) {
+                  // 下载app
+                  _this.toUpdateAPK(res.data.url);
+                }
+              }
+            });
+          }
+        });
+      });
+    },
+    toUpdateAPK: function toUpdateAPK(url) {
+      if (!url) return;
+      uni.showLoading({
+        title: '更新中……',
+        mask: true
+      });
+      uni.downloadFile({
+        url: url,
+        success: function success(res) {
+          uni.hideLoading();
+          if (res.statusCode == 200) {
+            uni.showModal({
+              content: '更新成功,确定现在重启吗?',
+              confirmText: '重启',
+              confirmColor: '#EE8F57',
+              success: function success(modalRes) {
+                if (modalRes.confirm) {
+                  plus.runtime.install(res.tempFilePath, {
+                    force: true
+                  }, function (res) {
+                    plus.runtime.restart();
+                  });
+                }
+              }
+            });
+          }
+        }
+      });
+    }
+  }
+};
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

+ 34 - 7
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -769,8 +769,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__2080341",
     appName: "益智游戏",
-    appVersion: "1.0.0",
-    appVersionCode: "100",
+    appVersion: "1.0.9",
+    appVersionCode: "109",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "3.6.18",
     uniRuntimeVersion: "3.6.18",
@@ -868,8 +868,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__2080341",
       appName: "益智游戏",
-      appVersion: "1.0.0",
-      appVersionCode: "100",
+      appVersion: "1.0.9",
+      appVersionCode: "109",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,
@@ -9578,10 +9578,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   // 接口地址
-  serverUrl: "https://broadcast.waityou24.cn",
+  serverUrl: "http://47.93.34.200",
+  //http://47.93.34.200   http://www.freeskyghw.cn
   wechatUrl: "https://broadcast.waityou24.cn",
   // 设备信息
-  system: uni.getSystemInfoSync()
+  system: uni.getSystemInfoSync(),
+  // 节目类型
+  pro_type: [
+  //
+  {
+    dict_label: '电视节目',
+    dict_value: '0'
+  }, {
+    dict_label: '电影节目',
+    dict_value: '1'
+  }]
 };
 exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
@@ -10110,7 +10121,23 @@ module.exports = _asyncToGenerator, module.exports.__esModule = true, module.exp
 /* 77 */,
 /* 78 */,
 /* 79 */,
-/* 80 */
+/* 80 */,
+/* 81 */,
+/* 82 */,
+/* 83 */,
+/* 84 */,
+/* 85 */,
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */
 /*!**********************************************************************************!*\
   !*** D:/project/项目模板/uniapp/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \**********************************************************************************/

Plik diff jest za duży
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/upload/index.js


+ 17 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -166,17 +166,27 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
       logoUrl: 'https://broadcast.waityou24.cn/files/test/20230116145912.jpg',
-      timer: null
+      timer: null,
+      versionInfo: {}
     };
   },
   onLoad: function onLoad() {
     var that = this;
     that.search('/pagesHome/home/index');
   },
+  onShow: function onShow() {
+    var that = this;
+    // 获取版本信息
+    plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
+      that.$set(that, "versionInfo", wgtinfo);
+      that.setTitle(wgtinfo);
+    });
+  },
   methods: {
     search: function search(e) {
       var _this = this;
@@ -204,6 +214,12 @@ var _default = {
           }
         }, _callee);
       }))();
+    },
+    // 赋值标题栏
+    setTitle: function setTitle(e) {
+      uni.setNavigationBarTitle({
+        title: e.name
+      });
     }
   }
 };

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="content"><view class="one"><image src="{{logoUrl}}" mode="aspectFit"></image></view><view class="two"><view class="two_1">抵制不良游戏,拒绝盗版游戏。</view><view class="two_1">注意自我保护,谨防受骗上当。</view><view class="two_1">适度游戏宜脑,沉迷游戏伤身体。</view><view class="two_1">合理安排时间,享受健康时间。</view></view></view>
+<view class="content"><view class="one"><image src="{{logoUrl}}" mode="aspectFit"></image><view class="version">{{versionInfo.version}}</view></view><view class="two"><view class="two_1">抵制不良游戏,拒绝盗版游戏。</view><view class="two_1">注意自我保护,谨防受骗上当。</view><view class="two_1">适度游戏宜脑,沉迷游戏伤身体。</view><view class="two_1">合理安排时间,享受健康时间。</view></view></view>

+ 4 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -12,10 +12,13 @@
 .content .one image {
   width: 50vw;
   height: 50vw;
-  border-radius: 90px;
+  border-radius: 90%;
   box-shadow: 0 0 5px #f1f1f1;
   margin: 30vw 0 0 0;
 }
+.content .one .version {
+  margin: 2vw 0 0 0;
+}
 .content .two {
   text-align: center;
   padding: 10px 0;

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js

@@ -143,7 +143,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   Promise.all(/*! require.ensure | components/upload/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/upload/index")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 68));
+    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 84));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

Plik diff jest za duży
+ 7 - 157
unpackage/dist/dev/mp-weixin/pagesHome/home/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml


+ 3 - 62
unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxss

@@ -6,69 +6,10 @@
   height: 100vh;
 }
 .content .one {
-  border-bottom: 1px solid #000000;
-}
-.content .one input {
-  padding: 2vw;
-  background-color: #f1f1f1;
-  font-size: 14px;
-  border-radius: 5px;
-}
-.content .two {
-  position: relative;
-  flex-grow: 1;
-  padding: 0 10px;
-}
-.content .two .list {
-  margin: 10px 0 0 0;
-  padding: 10px;
-  border-radius: 5px;
-  box-shadow: 0 0 5px #cccccc;
-}
-.content .two .list .name {
-  font-size: 16px;
-  font-weight: bold;
-  margin: 0 0 5px 0;
-}
-.content .two .list .other {
-  margin: 0 0 10px 0;
-}
-.content .two .list .other .other_1 {
-  margin: 0 0 5px 0;
-}
-.content .two .list .other .other_1 text {
-  font-size: 14px;
-  color: #858585;
-}
-.content .two .list .other .other_1 text:last-child {
-  color: #000000;
-  word-break: break-all;
-}
-.content .two .list .btn {
-  text-align: center;
-}
-.content .two .list:last-child {
-  margin: 10px 0;
-}
-.scroll-view {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.scroll-view .list-scroll-view {
-  display: flex;
-  flex-direction: column;
-  padding: 0 10px;
-}
-.is_bottom {
+  margin: 2vw;
   text-align: center;
 }
-.is_bottom text {
-  padding: 2vw 0;
-  display: inline-block;
-  color: #858585;
-  font-size: 14px;
+.content .one button {
+  margin: 0.5vw;
 }
 

+ 0 - 1
unpackage/dist/dev/mp-weixin/pagesHome/home/video.wxml

@@ -1 +0,0 @@
-<view class="content"><view class="one"><video src="{{info.path}}"></video></view></view>

Plik diff jest za duży
+ 137 - 78
unpackage/dist/dev/mp-weixin/pagesHome/home/video.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesHome/prize/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "抽奖",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesHome/prize/index.wxml

@@ -0,0 +1 @@
+<view class="content"><view class="one"><view class="one_1"><text style="{{'background:'+(''+prizeInfo.color)+';'}}">{{prizeInfo.name||'待开奖中'}}</text></view><view class="one_2"><button type="{{is_start==true?'warn':'primary'}}" size="mini" data-event-opts="{{[['tap',[['toCommon']]]]}}" bindtap="__e">{{is_start==true?'结束':'开始'}}</button></view></view></view>

+ 27 - 0
unpackage/dist/dev/mp-weixin/pagesHome/prize/index.wxss

@@ -0,0 +1,27 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  text-align: center;
+}
+.content .one .one_1 {
+  margin: 2vw 0;
+}
+.content .one .one_1 text {
+  display: inline-block;
+  width: 50vw;
+  height: 50vw;
+  text-align: center;
+  line-height: 50vw;
+  border-radius: 90%;
+  background-color: #000000;
+  color: #ffffff;
+  font-weight: bold;
+  font-size: 30px;
+  font-family: cursive;
+}
+

Plik diff jest za duży
+ 384 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/index.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "电视节目",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/index.wxml


+ 74 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/index.wxss

@@ -0,0 +1,74 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  border-bottom: 1px solid #000000;
+}
+.content .one input {
+  padding: 2vw;
+  background-color: #f1f1f1;
+  font-size: 14px;
+  border-radius: 5px;
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  padding: 0 10px;
+}
+.content .two .list {
+  margin: 10px 0 0 0;
+  padding: 10px;
+  border-radius: 5px;
+  box-shadow: 0 0 5px #cccccc;
+}
+.content .two .list .name {
+  font-size: 16px;
+  font-weight: bold;
+  margin: 0 0 5px 0;
+}
+.content .two .list .other {
+  margin: 0 0 10px 0;
+}
+.content .two .list .other .other_1 {
+  margin: 0 0 5px 0;
+}
+.content .two .list .other .other_1 text {
+  font-size: 14px;
+  color: #858585;
+}
+.content .two .list .other .other_1 text:last-child {
+  color: #000000;
+  word-break: break-all;
+}
+.content .two .list .btn {
+  text-align: center;
+}
+.content .two .list:last-child {
+  margin: 10px 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  padding: 0 10px;
+}
+.is_bottom {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: #858585;
+  font-size: 14px;
+}
+

Plik diff jest za duży
+ 236 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/info.js


unpackage/dist/dev/mp-weixin/pagesHome/home/video.json → unpackage/dist/dev/mp-weixin/pagesHome/video/info.json


+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesHome/video/info.wxml

@@ -0,0 +1 @@
+<view class="content"><view class="one"><video src="{{info.path}}" page-gesture="{{true}}" show-mute-btn="{{true}}" play-strategy="{{2}}"></video></view></view>

unpackage/dist/dev/mp-weixin/pagesHome/home/video.wxss → unpackage/dist/dev/mp-weixin/pagesHome/video/info.wxss


Plik diff jest za duży
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js