t

api/cust.js

@@ -105,4 +105,7 @@ export default {
 	apiactivityenroll: params => { // 活动 报名
 	  return request('api/activity/enroll', params, 'loading')
 	},
+	apiactivitysign: params => { // 活动 报名 扫码签到
+		return request('api/activity/sign', params, 'loading')
+	  },
 }

pages/index/index.vue

@@ -23,6 +23,7 @@
 						</view>
 					</view>
 					<image v-if="userInfo.estate_govern && userInfo.estate_govern.length > 0" src="/static/index/i_c_1.png" class="scoped-scan-img" @click="scanHandle"></image>
+					<image v-else src="/static/index/i_c_1s.png" class="scoped-scan-img" @click="scan2Handle"></image>
 				</view>
 				<u-button
 					v-if="!userInfo.user_id"
@@ -251,6 +252,26 @@
 		<u-skeleton :loading="skeletonLoading" animation></u-skeleton>
 
 		<backTop :src="backTop.src"  :scrollTop="backTop.scrollTop"></backTop>
+
+
+		<u-popup v-model="qrcodeShow" mode="center" width="80%" height="500rpx" border-radius="20" closeable>
+			<view class="bwin-popup">
+				<view class="popup-header">现场二维码签到</view>
+				<view class="popup-body">
+					<view class="scoped-qrcode" v-if="qrcodeBcObj.info === '您已经签到过了'">
+						<u-image src="/static/icon_s_02.png" mode="heightFix" height="118rpx" class="icon"></u-image>
+						<view class="sq-p1">{{ qrcodeBcObj.info }}</view>
+						<view class="sq-p2 t2">签到时间：{{ qrcodeBcObj.data.create_at }}</view>
+					</view>
+					<view class="scoped-qrcode" v-else>
+						<u-image src="/static/icon_s_01.png" mode="heightFix" height="118rpx" class="icon"></u-image>
+						<view class="sq-p1">{{ qrcodeBcObj.info }}</view>
+						<view class="sq-p2">签到时间：{{ qrcodeBcObj.data ? qrcodeBcObj.data.create_at : '' }}</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
 	</view>
 </template>
 
@@ -285,6 +306,8 @@ export default {
 	data() {
 		// 页面数据变量
 		return {
+			qrcodeShow: false,
+			qrcodeBcObj: {},
 			remind_total: 0,
 			curRoles: '',
 			isOneRow: false,
@@ -396,6 +419,17 @@ export default {
 				}
 			})
 		},
+		scan2Handle () {
+			const that = this
+			uni.scanCode({
+				success: function (res) {
+					uni.api.cust.apiactivitysign({code: res.result}).then(res => {
+						that.qrcodeShow = true
+						that.qrcodeBcObj = res || {}
+					})
+				}
+			})
+		},
 		// 页面数据初始化函数
 		init(options) {
 			const userInfo2 = uni.getStorageSync('MD_userInfo2')
@@ -920,4 +954,27 @@ export default {
 	color: #2080f0;
 	font-weight: bold;
 }
+
+
+
+.scoped-qrcode {
+	text-align: center;
+	padding-top: 30rpx;
+	.sq-p1 {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #333;
+		padding-bottom: 10rpx;
+		padding-top: 30rpx;
+	}
+	.sq-p2 {
+		color: #666;
+		font-size: 28rpx;
+		&.t2 {
+			color: #f00;
+			font-weight: bold;
+		}
+	}
+}
+
 </style>

unpackage/dist/build/mp-weixin/components/back-top/back-top.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var objectKeys = ['qy', 'env', 'error', 'version', 'lanDebug', 'cloud', 'serviceMarket', 'router', 'worklet'];
+var objectKeys = ['qy', 'env', 'error', 'version', 'lanDebug', 'cloud', 'serviceMarket', 'router', 'worklet', '__webpack_require_UNI_MP_PLUGIN__'];
 var singlePageDisableKey = ['lanDebug', 'router', 'worklet'];
 var target = typeof globalThis !== 'undefined' ? globalThis : function () {
   return this;
@@ -1446,22 +1446,22 @@ function removeInterceptor(method, option) {
     removeInterceptorHook(globalInterceptors, method);
   }
 }
-function wrapperHook(hook) {
+function wrapperHook(hook, params) {
   return function (data) {
-    return hook(data) || data;
+    return hook(data, params) || data;
   };
 }
 function isPromise(obj) {
   return !!obj && ((0, _typeof2.default)(obj) === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
 }
-function queue(hooks, data) {
+function queue(hooks, data, params) {
   var promise = false;
   for (var i = 0; i < hooks.length; i++) {
     var hook = hooks[i];
     if (promise) {
-      promise = Promise.resolve(wrapperHook(hook));
+      promise = Promise.resolve(wrapperHook(hook, params));
     } else {
-      var res = hook(data);
+      var res = hook(data, params);
       if (isPromise(res)) {
         promise = Promise.resolve(res);
       }
@@ -1484,7 +1484,7 @@ function wrapperOptions(interceptor) {
     if (Array.isArray(interceptor[name])) {
       var oldCallback = options[name];
       options[name] = function callbackInterceptor(res) {
-        queue(interceptor[name], res).then(function (res) {
+        queue(interceptor[name], res, options).then(function (res) {
           /* eslint-disable no-mixed-operators */
           return isFn(oldCallback) && oldCallback(res) || res;
         });
@@ -1533,7 +1533,8 @@ function invokeApi(method, api, options) {
     if (Array.isArray(interceptor.invoke)) {
       var res = queue(interceptor.invoke, options);
       return res.then(function (options) {
-        return api.apply(void 0, [wrapperOptions(interceptor, options)].concat(params));
+        // 重新访问 getApiInterceptorHooks, 允许 invoke 中再次调用 addInterceptor,removeInterceptor
+        return api.apply(void 0, [wrapperOptions(getApiInterceptorHooks(method), options)].concat(params));
       });
     } else {
       return api.apply(void 0, [wrapperOptions(interceptor, options)].concat(params));
@@ -1977,8 +1978,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.7.3",
-    uniRuntimeVersion: "3.7.3",
+    uniCompileVersion: "3.8.12",
+    uniRuntimeVersion: "3.8.12",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -2577,6 +2578,19 @@ function toSkip(obj) {
   }
   return obj;
 }
+var WORKLET_RE = /_(.*)_worklet_factory_/;
+function initWorkletMethods(mpMethods, vueMethods) {
+  if (vueMethods) {
+    Object.keys(vueMethods).forEach(function (name) {
+      var matches = name.match(WORKLET_RE);
+      if (matches) {
+        var workletName = matches[1];
+        mpMethods[name] = vueMethods[name];
+        mpMethods[workletName] = vueMethods[workletName];
+      }
+    });
+  }
+}
 var MPPage = Page;
 var MPComponent = Component;
 var customizeRE = /:/g;
@@ -2741,7 +2755,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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -3138,14 +3152,10 @@ function handleEvent(event) {
   }
 }
 var eventChannels = {};
-var eventChannelStack = [];
 function getEventChannel(id) {
-  if (id) {
-    var eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel;
-  }
-  return eventChannelStack.shift();
+  var eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel;
 }
 var hooks = ['onShow', 'onHide', 'onError', 'onPageNotFound', 'onThemeChange', 'onUnhandledRejection'];
 function initEventChannel() {
@@ -3167,38 +3177,54 @@ function initEventChannel() {
 function initScopedSlotsParams() {
   var center = {};
   var parents = {};
-  _vue.default.prototype.$hasScopedSlotsParams = function (vueId) {
-    var has = center[vueId];
-    if (!has) {
+  function currentId(fn) {
+    var vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      var vueId = vueIds.split(',')[0];
+      fn(vueId);
+    }
+  }
+  _vue.default.prototype.$hasSSP = function (vueId) {
+    var slot = center[vueId];
+    if (!slot) {
       parents[vueId] = this;
       this.$on('hook:destroyed', function () {
         delete parents[vueId];
       });
     }
-    return has;
+    return slot;
   };
-  _vue.default.prototype.$getScopedSlotsParams = function (vueId, name, key) {
-    var data = center[vueId];
-    if (data) {
-      var object = data[name] || {};
-      return key ? object[key] : object;
-    } else {
-      parents[vueId] = this;
-      this.$on('hook:destroyed', function () {
-        delete parents[vueId];
-      });
+  _vue.default.prototype.$getSSP = function (vueId, name, needAll) {
+    var slot = center[vueId];
+    if (slot) {
+      var params = slot[name] || [];
+      if (needAll) {
+        return params;
+      }
+      return params[0];
     }
   };
-  _vue.default.prototype.$setScopedSlotsParams = function (name, value) {
-    var vueIds = this.$options.propsData.vueId;
-    if (vueIds) {
-      var vueId = vueIds.split(',')[0];
-      var object = center[vueId] = center[vueId] || {};
-      object[name] = value;
+  _vue.default.prototype.$setSSP = function (name, value) {
+    var index = 0;
+    currentId.call(this, function (vueId) {
+      var slot = center[vueId];
+      var params = slot[name] = slot[name] || [];
+      params.push(value);
+      index = params.length - 1;
+    });
+    return index;
+  };
+  _vue.default.prototype.$initSSP = function () {
+    currentId.call(this, function (vueId) {
+      center[vueId] = {};
+    });
+  };
+  _vue.default.prototype.$callSSP = function () {
+    currentId.call(this, function (vueId) {
       if (parents[vueId]) {
         parents[vueId].$forceUpdate();
       }
-    }
+    });
   };
   _vue.default.mixin({
     destroyed: function destroyed() {
@@ -3350,6 +3376,7 @@ function parseBaseComponent(vueComponentOptions) {
     vueOptions = _initVueComponent2[1];
   var options = _objectSpread({
     multipleSlots: true,
+    // styleIsolation: 'apply-shared',
     addGlobalClass: true
   }, vueOptions.options || {});
   {
@@ -3463,6 +3490,9 @@ function parseBasePage(vuePageOptions) {
   {
     initUnknownHooks(pageOptions.methods, vuePageOptions, ['onReady']);
   }
+  {
+    initWorkletMethods(pageOptions.methods, vueOptions.methods);
+  }
   return pageOptions;
 }
 function parsePage(vuePageOptions) {
@@ -3592,7 +3622,7 @@ if (typeof Proxy !== 'undefined' && "mp-weixin" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(function (name) {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
   Object.keys(eventApi).forEach(function (name) {
@@ -3674,7 +3704,6 @@ var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runt
 var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/classCallCheck */ 23));
 var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/createClass */ 24));
 var _typeof2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/typeof */ 13));
-var isArray = Array.isArray;
 var isObject = function isObject(val) {
   return val !== null && (0, _typeof2.default)(val) === 'object';
 };
@@ -3753,7 +3782,7 @@ function parse(format, _ref) {
 function compile(tokens, values) {
   var compiled = [];
   var index = 0;
-  var mode = isArray(values) ? 'list' : isObject(values) ? 'named' : 'unknown';
+  var mode = Array.isArray(values) ? 'list' : isObject(values) ? 'named' : 'unknown';
   if (mode === 'unknown') {
     return compiled;
   }
@@ -3819,6 +3848,10 @@ function normalizeLocale(locale, messages) {
     return locale;
   }
   locale = locale.toLowerCase();
+  if (locale === 'chinese') {
+    // 支付宝
+    return LOCALE_ZH_HANS;
+  }
   if (locale.indexOf('zh') === 0) {
     if (locale.indexOf('-hans') > -1) {
       return LOCALE_ZH_HANS;
@@ -3831,7 +3864,11 @@ function normalizeLocale(locale, messages) {
     }
     return LOCALE_ZH_HANS;
   }
-  var lang = startsWith(locale, [LOCALE_EN, LOCALE_FR, LOCALE_ES]);
+  var locales = [LOCALE_EN, LOCALE_FR, LOCALE_ES];
+  if (messages && Object.keys(messages).length > 0) {
+    locales = Object.keys(messages);
+  }
+  var lang = startsWith(locale, locales);
   if (lang) {
     return lang;
   }
@@ -4138,7 +4175,7 @@ function compileJsonObj(jsonObj, localeValues, delimiters) {
   return jsonObj;
 }
 function walkJsonObj(jsonObj, walk) {
-  if (isArray(jsonObj)) {
+  if (Array.isArray(jsonObj)) {
     for (var i = 0; i < jsonObj.length; i++) {
       if (walk(jsonObj, i)) {
         return true;
@@ -4233,7 +4270,7 @@ module.exports = _createClass, module.exports.__esModule = true, module.exports[
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(global) {/*!
  * Vue.js v2.6.11
- * (c) 2014-2022 Evan You
+ * (c) 2014-2023 Evan You
  * Released under the MIT License.
  */
 /*  */
@@ -9761,7 +9798,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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","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 + ']');
@@ -9782,14 +9819,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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9885,7 +9922,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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -10243,12 +10280,13 @@ var LIFECYCLE_HOOKS$1 = [
     'onNavigationBarSearchInputChanged',
     'onNavigationBarSearchInputConfirmed',
     'onNavigationBarSearchInputClicked',
+    'onUploadDouyinVideo',
+    'onNFCReadMessage',
     //Component
     // 'onReady', // 兼容旧版本，应该移除该事件
     'onPageShow',
     'onPageHide',
-    'onPageResize',
-    'onUploadDouyinVideo'
+    'onPageResize'
 ];
 function lifecycleMixin$1(Vue) {
 
@@ -13632,7 +13670,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {
@@ -16260,6 +16298,10 @@ var _default = {
   apiactivityenroll: function apiactivityenroll(params) {
     // 活动 报名
     return (0, _http.request)('api/activity/enroll', params, 'loading');
+  },
+  apiactivitysign: function apiactivitysign(params) {
+    // 活动 报名 扫码签到
+    return (0, _http.request)('api/activity/sign', params, 'loading');
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/components/back-top/back-top.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/agent/report/buycheck.js

@@ -160,11 +160,9 @@ var render = function () {
             var g1 = item.estate_report_conf
               ? item.estate_report_conf.split(",")
               : null
-            var g2 = JSON.parse(item.more)
             return {
               $orig: $orig,
               g1: g1,
-              g2: g2,
             }
           }
         )
@@ -174,15 +172,23 @@ var render = function () {
       l0: l0,
     }
   })
-  var g3 = _vm.customerList.length
+  var g2 = _vm.customerList.length
   if (!_vm._isMounted) {
-    _vm.e0 = function ($event) {
-      _vm.searchPopupShow = true
+    _vm.e0 = function ($event, item, moreI) {
+      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp2 = _temp.eventParams || _temp["event-params"],
+        item = _temp2.item,
+        moreI = _temp2.moreI
+      var _temp, _temp2
+      _vm.previewImgHandle("more", JSON.parse(item.more), moreI)
     }
     _vm.e1 = function ($event) {
-      _vm.searchPopupShow = false
+      _vm.searchPopupShow = true
     }
     _vm.e2 = function ($event) {
+      _vm.searchPopupShow = false
+    }
+    _vm.e3 = function ($event) {
       _vm.isReferrerShow = false
     }
   }
@@ -192,7 +198,7 @@ var render = function () {
       $root: {
         g0: g0,
         l1: l1,
-        g3: g3,
+        g2: g2,
       },
     }
   )

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

@@ -479,6 +479,27 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 var that;
 var backTop = function backTop() {
@@ -517,6 +538,8 @@ var _default = {
   data: function data() {
     // 页面数据变量
     return {
+      qrcodeShow: false,
+      qrcodeBcObj: {},
       remind_total: 0,
       curRoles: '',
       isOneRow: false,
@@ -627,6 +650,19 @@ var _default = {
         }
       });
     },
+    scan2Handle: function scan2Handle() {
+      var that = this;
+      uni.scanCode({
+        success: function success(res) {
+          uni.api.cust.apiactivitysign({
+            code: res.result
+          }).then(function (res) {
+            that.qrcodeShow = true;
+            that.qrcodeBcObj = res || {};
+          });
+        }
+      });
+    },
     // 页面数据初始化函数
     init: function init(options) {
       var _this = this;

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

@@ -358,4 +358,23 @@
   color: #2080f0;
   font-weight: bold;
 }
+.scoped-qrcode.data-v-57280228 {
+  text-align: center;
+  padding-top: 30rpx;
+}
+.scoped-qrcode .sq-p1.data-v-57280228 {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  padding-bottom: 10rpx;
+  padding-top: 30rpx;
+}
+.scoped-qrcode .sq-p2.data-v-57280228 {
+  color: #666;
+  font-size: 28rpx;
+}
+.scoped-qrcode .sq-p2.t2.data-v-57280228 {
+  color: #f00;
+  font-weight: bold;
+}