guhongwei 2 years ago
parent
commit
933fec41b1
50 changed files with 94 additions and 75 deletions
  1. 8 6
      manifest.json
  2. 5 1
      pagesVideo/components/c-drawer.vue
  3. 4 5
      pagesVideo/search/index.vue
  4. 1 1
      unpackage/dist/build/app-plus/__uniapppicker.js
  5. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  6. 2 2
      unpackage/dist/build/app-plus/app-service.js
  7. 1 1
      unpackage/dist/build/app-plus/app-view.js
  8. 1 1
      unpackage/dist/build/app-plus/manifest.json
  9. 1 0
      unpackage/dist/build/app-plus/pagesAccount/app-sub-service.js
  10. 1 1
      unpackage/dist/build/app-plus/pagesCommon/app-sub-service.js
  11. 1 1
      unpackage/dist/build/app-plus/pagesHome/app-sub-service.js
  12. 1 0
      unpackage/dist/build/app-plus/pagesVideo/app-sub-service.js
  13. 1 1
      unpackage/dist/build/app-plus/view.css
  14. 2 2
      unpackage/dist/build/app-plus/view.umd.min.js
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  41. 1 1
      unpackage/dist/dev/app-plus/app-config-service.js
  42. 9 1
      unpackage/dist/dev/app-plus/app-view.js
  43. 1 1
      unpackage/dist/dev/app-plus/manifest.json
  44. 2 2
      unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js
  45. 3 2
      unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js
  46. 11 11
      unpackage/dist/dev/mp-weixin/common/vendor.js
  47. 4 0
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js
  48. 1 1
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxml
  49. 4 5
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js
  50. 1 1
      unpackage/dist/dev/mp-weixin/project.config.json

+ 8 - 6
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "益智游戏",
+    "name" : "自由天空",
     "appid" : "__UNI__2080341",
-    "description" : "",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "description" : "自由天空",
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -18,7 +18,8 @@
         },
         /* 模块配置 */
         "modules" : {
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -120,5 +121,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "locale" : "zh-Hans"
 }

+ 5 - 1
pagesVideo/components/c-drawer.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="true" :width="290">
+		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="true" :width="290" @change="drawerChange">
 			<view class="drawer">
 				<view class="drawer_1">
 					<view class="left textOver">
@@ -35,6 +35,10 @@
 			return {};
 		},
 		methods: {
+			drawerChange(e) {
+				const that = this;
+				if (e == false) that.$emit('toClose')
+			},
 			drawerOpen() {
 				const that = this;
 				that.$refs.drawerShow.open();

+ 4 - 5
pagesVideo/search/index.vue

@@ -202,11 +202,11 @@
 			// 打开弹框
 			toFilter() {
 				const that = this;
-				that.drawer = {
+				that.$set(that, `drawer`, {
 					title: '筛选',
 					show: true,
 					mode: 'right'
-				}
+				})
 			},
 			// 重置
 			toReset() {
@@ -216,7 +216,6 @@
 				that.search()
 			},
 			toSave() {
-				console.log('2');
 				const that = this;
 				that.clearPage();
 				that.toClose();
@@ -225,11 +224,11 @@
 			// 关闭弹框
 			toClose() {
 				const that = this;
-				that.drawer = {
+				that.$set(that, `drawer`, {
 					title: '筛选',
 					show: false,
 					mode: 'right'
-				}
+				})
 			},
 			// 查询其他信息
 			async searchOther() {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/__uniapppicker.js


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/app-plus/pagesAccount/app-sub-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/pagesCommon/app-sub-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/pagesHome/app-sub-service.js


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/app-plus/pagesVideo/app-sub-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/view.css


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/app-plus/view.umd.min.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/app-plus/app-config-service.js


+ 9 - 1
unpackage/dist/dev/app-plus/app-view.js

@@ -8765,7 +8765,15 @@ var render = function () {
     [
       _c(
         "uni-drawer",
-        { ref: "drawerShow", attrs: { _i: 1 } },
+        {
+          ref: "drawerShow",
+          attrs: { _i: 1 },
+          on: {
+            change: function ($event) {
+              return _vm.$handleViewEvent($event)
+            },
+          },
+        },
         [
           _c(
             "uni-view",

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/app-plus/manifest.json


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js


File diff suppressed because it is too large
+ 3 - 2
unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js


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

@@ -3109,9 +3109,9 @@ function populateParameters(result) {
 
   var parameters = {
     appId: "__UNI__2080341",
-    appName: "益智游戏",
-    appVersion: "1.1.1",
-    appVersionCode: "111",
+    appName: "自由天空",
+    appVersion: "1.1.2",
+    appVersionCode: "112",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "3.7.3",
     uniRuntimeVersion: "3.7.3",
@@ -3208,9 +3208,9 @@ var getAppBaseInfo = {
     var hostLanguage = language.replace('_', '-');
     result = sortObject(Object.assign(result, {
       appId: "__UNI__2080341",
-      appName: "益智游戏",
-      appVersion: "1.1.1",
-      appVersionCode: "111",
+      appName: "自由天空",
+      appVersion: "1.1.2",
+      appVersionCode: "112",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,
@@ -3877,7 +3877,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"自由天空","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -18080,7 +18080,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"自由天空","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -18101,14 +18101,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"自由天空","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"自由天空","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -18204,7 +18204,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"自由天空","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

+ 4 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js

@@ -182,6 +182,10 @@ var _default = {
     return {};
   },
   methods: {
+    drawerChange: function drawerChange(e) {
+      var that = this;
+      if (e == false) that.$emit('toClose');
+    },
     drawerOpen: function drawerOpen() {
       var that = this;
       that.$refs.drawerShow.open();

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxml


+ 4 - 5
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js

@@ -350,11 +350,11 @@ var _default = {
     // 打开弹框
     toFilter: function toFilter() {
       var that = this;
-      that.drawer = {
+      that.$set(that, "drawer", {
         title: '筛选',
         show: true,
         mode: 'right'
-      };
+      });
     },
     // 重置
     toReset: function toReset() {
@@ -364,7 +364,6 @@ var _default = {
       that.search();
     },
     toSave: function toSave() {
-      console.log('2');
       var that = this;
       that.clearPage();
       that.toClose();
@@ -373,11 +372,11 @@ var _default = {
     // 关闭弹框
     toClose: function toClose() {
       var that = this;
-      that.drawer = {
+      that.$set(that, "drawer", {
         title: '筛选',
         show: false,
         mode: 'right'
-      };
+      });
     },
     // 查询其他信息
     searchOther: function searchOther() {

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -20,7 +20,7 @@
     "compileType": "miniprogram",
     "libVersion": "2.30.0",
     "appid": "wx0fd4b616bc7cf3bb",
-    "projectname": "益智游戏",
+    "projectname": "自由天空",
     "condition": {},
     "editorSetting": {
         "tabIndent": "insertSpaces",