1

App.vue

@@ -9,11 +9,11 @@
 			const that = this;
 			// 设备信息
 			let system = that.$config.system;
-			// if (system.uniPlatform == 'app') {
-			// 	that.appCheck()
-			// } else if (system.uniPlatform == 'mp-weixin') {
-			// 	that.weixinCheck()
-			// }
+			if (system.uniPlatform == 'app') {
+				that.appCheck()
+			} else if (system.uniPlatform == 'mp-weixin') {
+				that.weixinCheck()
+			}
 		},
 		methods: {
 			// app检查版本
@@ -21,10 +21,9 @@
 				const that = this;
 				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 					uni.request({
-						url: `${that.$config.serverUrl}/files/project/appVersion.json`,
+						url: `${that.$config.serverUrl}/files/projectadmin/appVersion.json`,
 						method: 'GET',
 						success: (res) => {
-							console.log(res.data);
 							if (wgtinfo.version === res.data.version) return;
 							uni.showModal({
 								title: '更新',

common/config.js

@@ -1,6 +1,6 @@
 export default {
 	// 接口地址
-	serverUrl: "http://192.168.1.144:10102", //http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
+	serverUrl: "http://broadcast.waityou24.cn", //http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
 	fileserverUrl: 'http://broadcast.waityou24.cn',
 	wechatUrl: "http://broadcast.waityou24.cn",
 	// 设备信息

pages/index/index.vue

@@ -40,21 +40,24 @@
 				let url = '/pagesHome/home/index';
 				let res = await that.$api('appbasic', 'GET', {});
 				if (res.errcode == '0') {
-					that.$set(that, `basicInfo`, res.data)
-					uni.setStorage({
-						key: 'basicInfo',
-						data: res.data,
-						success: function() {
-							// 不可返回
-							// uni.redirectTo({
-							// 	url
-							// })
-							// 可返回
-							uni.redirectTo({
-								url
-							})
-						}
-					});
+					if (res.data &&res.data._id ) {
+						that.$set(that, `basicInfo`, res.data)
+						uni.setStorage({
+							key: 'basicInfo',
+							data: res.data,
+							success: function() {
+								uni.redirectTo({
+									url
+								})
+							}
+						});
+					} else {
+						uni.showToast({
+							title: '程序缺少必要信息，暂不可使用！',
+							icon: 'none'
+						})
+					}
+
 				} else {
 					uni.showToast({
 						title: res.errmsg,

pagesAccount/register/index.vue

@@ -34,7 +34,7 @@
 				</checkbox-group>
 			</view>
 			<view class="btn">
-				<button size="mini" @tap="toSubmit('form')">提交登录</button>
+				<button size="mini" @tap="toSubmit('form')">提交注册</button>
 			</view>
 		</view>
 	</view>

pagesVideo/components/c-drawer.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
-		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="false" width="290">
+		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="true" :width="290">
 			<view class="drawer">
 				<view class="drawer_1">
 					<view class="left textOver">
 						{{drawer.title||'弹窗'}}
 					</view>
 					<view class="right">
-						<uni-icons type="clear" size="30" @tap="drawerClose()"></uni-icons>
+						<uni-icons type="clear" size="30" @tap="toClose()"></uni-icons>
 					</view>
 				</view>
 				<view class="drawer_2">
@@ -39,17 +39,20 @@
 				const that = this;
 				that.$refs.drawerShow.open();
 			},
+			toClose() {
+				const that = this;
+				that.$emit('toClose')
+			},
 			drawerClose() {
 				const that = this;
 				that.$refs.drawerShow.close();
-				that.$emit('toClose')
 			}
 		},
 		watch: {
-			drawer(newVal) {
+			drawer(newVal, oldVal) {
 				const that = this;
-				if (newVal.show == true) that.drawerOpen();
-				else if (newVal.show == false) that.drawerClose();
+				if (newVal.show == true && oldVal.show == false) that.drawerOpen();
+				else if (newVal.show == false && oldVal.show == true) that.drawerClose();
 			}
 		}
 	}

pagesVideo/search/index.vue

@@ -216,6 +216,7 @@
 				that.search()
 			},
 			toSave() {
+				console.log('2');
 				const that = this;
 				that.clearPage();
 				that.toClose();

unpackage/dist/dev/mp-weixin/common/main.js

@@ -121,13 +121,12 @@ var _default = {
     var that = this;
     // 设备信息
     var system = that.$config.system;
-    // if (system.uniPlatform == 'app') {
-    // 	that.appCheck()
-    // } else if (system.uniPlatform == 'mp-weixin') {
-    // 	that.weixinCheck()
-    // }
+    if (system.uniPlatform == 'app') {
+      that.appCheck();
+    } else if (system.uniPlatform == 'mp-weixin') {
+      that.weixinCheck();
+    }
   },
-
   methods: {
     // app检查版本
     appCheck: function appCheck() {
@@ -135,10 +134,9 @@ var _default = {
       var that = this;
       plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
         uni.request({
-          url: "".concat(that.$config.serverUrl, "/files/project/appVersion.json"),
+          url: "".concat(that.$config.serverUrl, "/files/projectadmin/appVersion.json"),
           method: 'GET',
           success: function success(res) {
-            console.log(res.data);
             if (wgtinfo.version === res.data.version) return;
             uni.showModal({
               title: '更新',

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

@@ -3877,7 +3877,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","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));
@@ -18812,7 +18812,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   // 接口地址
-  serverUrl: "http://192.168.1.144:10102",
+  serverUrl: "http://broadcast.waityou24.cn",
   //http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
   fileserverUrl: 'http://broadcast.waityou24.cn',
   wechatUrl: "http://broadcast.waityou24.cn",

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -204,21 +204,23 @@ var _default = {
               case 4:
                 res = _context.sent;
                 if (res.errcode == '0') {
-                  that.$set(that, "basicInfo", res.data);
-                  uni.setStorage({
-                    key: 'basicInfo',
-                    data: res.data,
-                    success: function success() {
-                      // 不可返回
-                      // uni.redirectTo({
-                      // 	url
-                      // })
-                      // 可返回
-                      uni.redirectTo({
-                        url: url
-                      });
-                    }
-                  });
+                  if (res.data && res.data._id) {
+                    that.$set(that, "basicInfo", res.data);
+                    uni.setStorage({
+                      key: 'basicInfo',
+                      data: res.data,
+                      success: function success() {
+                        uni.redirectTo({
+                          url: url
+                        });
+                      }
+                    });
+                  } else {
+                    uni.showToast({
+                      title: '程序缺少必要信息，暂不可使用！',
+                      icon: 'none'
+                    });
+                  }
                 } else {
                   uni.showToast({
                     title: res.errmsg,

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

@@ -186,16 +186,19 @@ var _default = {
       var that = this;
       that.$refs.drawerShow.open();
     },
+    toClose: function toClose() {
+      var that = this;
+      that.$emit('toClose');
+    },
     drawerClose: function drawerClose() {
       var that = this;
       that.$refs.drawerShow.close();
-      that.$emit('toClose');
     }
   },
   watch: {
-    drawer: function drawer(newVal) {
+    drawer: function drawer(newVal, oldVal) {
       var that = this;
-      if (newVal.show == true) that.drawerOpen();else if (newVal.show == false) that.drawerClose();
+      if (newVal.show == true && oldVal.show == false) that.drawerOpen();else if (newVal.show == false && oldVal.show == true) that.drawerClose();
     }
   }
 };

unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.js

@@ -1,6 +0,0 @@
-
-wx.createComponent({
-    generic:true,
-    props: {},
-    render: function(){}
-})

unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.json

@@ -1,11 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "index-uni-forms-item-default": "/pagesVideo/search/index-uni-forms-item-default",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
-    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
-    "c-drawer": "/pagesVideo/components/c-drawer"
-  }
-}

unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxml

@@ -1 +0,0 @@
-是否热推

unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxss

@@ -1,2 +0,0 @@
-
-@import "./index.wxss"

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

@@ -364,6 +364,7 @@ var _default = {
       that.search();
     },
     toSave: function toSave() {
+      console.log('2');
       var that = this;
       that.clearPage();
       that.toClose();

unpackage/dist/dev/mp-weixin/pagesVideo/search/index.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "视频筛选",
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "index-uni-forms-item-default": "/pagesVideo/search/index-uni-forms-item-default",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",