测量记录显示问题

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules/
+unpackage/

unpackage/dist/dev/mp-weixin/Food/count/everyDay.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/count/everyDay"],{
 
 /***/ 198:
+<<<<<<< HEAD
 /*!******************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fcount%2FeveryDay"} ***!
   \******************************************************************************************/
+=======
+/*!**************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fcount%2FeveryDay"} ***!
+  \**************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_everyDay.default);
 /***/ }),
 
 /***/ 199:
+<<<<<<< HEAD
 /*!***********************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue ***!
   \***********************************************************************/
+=======
+/*!*******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue ***!
+  \*******************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "Food/count/everyDay.vue"
 /***/ }),
 
 /***/ 200:
+<<<<<<< HEAD
 /*!******************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=template&id=d329a3d8&scoped=true& ***!
   \******************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=template&id=d329a3d8&scoped=true& ***!
+  \**************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 201:
+<<<<<<< HEAD
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=template&id=d329a3d8&scoped=true& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=template&id=d329a3d8&scoped=true& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -135,9 +159,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 202:
+<<<<<<< HEAD
 /*!************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************/
+=======
+/*!********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=script&lang=js& ***!
+  \********************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -151,9 +181,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 203:
+<<<<<<< HEAD
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -247,9 +283,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 204:
+<<<<<<< HEAD
 /*!*********************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=style&index=0&id=d329a3d8&scoped=true&lang=scss& ***!
   \*********************************************************************************************************************************/
+=======
+/*!*****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=style&index=0&id=d329a3d8&scoped=true&lang=scss& ***!
+  \*****************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -263,9 +305,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 205:
+<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyDay.vue?vue&type=style&index=0&id=d329a3d8&scoped=true&lang=scss& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyDay.vue?vue&type=style&index=0&id=d329a3d8&scoped=true&lang=scss& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/count/everyMeal.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/count/everyMeal"],{
 
 /***/ 190:
+<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fcount%2FeveryMeal"} ***!
   \*******************************************************************************************/
+=======
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fcount%2FeveryMeal"} ***!
+  \***************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_everyMeal.default);
 /***/ }),
 
 /***/ 191:
+<<<<<<< HEAD
 /*!************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue ***!
   \************************************************************************/
+=======
+/*!********************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue ***!
+  \********************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "Food/count/everyMeal.vue"
 /***/ }),
 
 /***/ 192:
+<<<<<<< HEAD
 /*!*******************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=template&id=e85a7a0a&scoped=true& ***!
   \*******************************************************************************************************************/
+=======
+/*!***************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=template&id=e85a7a0a&scoped=true& ***!
+  \***************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 193:
+<<<<<<< HEAD
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=template&id=e85a7a0a&scoped=true& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=template&id=e85a7a0a&scoped=true& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -157,9 +181,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 194:
+<<<<<<< HEAD
 /*!*************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************/
+=======
+/*!*********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=script&lang=js& ***!
+  \*********************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -173,9 +203,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 195:
+<<<<<<< HEAD
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=script&lang=js& ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -347,9 +383,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 196:
+<<<<<<< HEAD
 /*!**********************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=style&index=0&id=e85a7a0a&scoped=true&lang=scss& ***!
   \**********************************************************************************************************************************/
+=======
+/*!******************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=style&index=0&id=e85a7a0a&scoped=true&lang=scss& ***!
+  \******************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -363,9 +405,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 197:
+<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/everyMeal.vue?vue&type=style&index=0&id=e85a7a0a&scoped=true&lang=scss& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/everyMeal.vue?vue&type=style&index=0&id=e85a7a0a&scoped=true&lang=scss& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/count/search.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/count/search"],{
 
 /***/ 206:
+<<<<<<< HEAD
 /*!****************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fcount%2Fsearch"} ***!
   \****************************************************************************************/
+=======
+/*!************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fcount%2Fsearch"} ***!
+  \************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_search.default);
 /***/ }),
 
 /***/ 207:
+<<<<<<< HEAD
 /*!*********************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue ***!
   \*********************************************************************/
+=======
+/*!*****************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue ***!
+  \*****************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "Food/count/search.vue"
 /***/ }),
 
 /***/ 208:
+<<<<<<< HEAD
 /*!****************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=template&id=3f42cc7b&scoped=true& ***!
   \****************************************************************************************************************/
+=======
+/*!************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=template&id=3f42cc7b&scoped=true& ***!
+  \************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 209:
+<<<<<<< HEAD
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=template&id=3f42cc7b&scoped=true& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=template&id=3f42cc7b&scoped=true& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -224,9 +248,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 210:
+<<<<<<< HEAD
 /*!**********************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************/
+=======
+/*!******************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -240,9 +270,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 211:
+<<<<<<< HEAD
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -688,9 +724,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 212:
+<<<<<<< HEAD
 /*!*******************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=style&index=0&id=3f42cc7b&lang=scss&scoped=true& ***!
   \*******************************************************************************************************************************/
+=======
+/*!***************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=style&index=0&id=3f42cc7b&lang=scss&scoped=true& ***!
+  \***************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -704,9 +746,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 213:
+<<<<<<< HEAD
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/search.vue?vue&type=style&index=0&id=3f42cc7b&lang=scss&scoped=true& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/search.vue?vue&type=style&index=0&id=3f42cc7b&lang=scss&scoped=true& ***!
+  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/count/setting.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/count/setting"],{
 
 /***/ 182:
+<<<<<<< HEAD
 /*!*****************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fcount%2Fsetting"} ***!
   \*****************************************************************************************/
+=======
+/*!*************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fcount%2Fsetting"} ***!
+  \*************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_setting.default);
 /***/ }),
 
 /***/ 183:
+<<<<<<< HEAD
 /*!**********************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue ***!
   \**********************************************************************/
+=======
+/*!******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue ***!
+  \******************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "Food/count/setting.vue"
 /***/ }),
 
 /***/ 184:
+<<<<<<< HEAD
 /*!*****************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=template&id=76db4fe6&scoped=true& ***!
   \*****************************************************************************************************************/
+=======
+/*!*************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=template&id=76db4fe6&scoped=true& ***!
+  \*************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 185:
+<<<<<<< HEAD
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=template&id=76db4fe6&scoped=true& ***!
   \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=template&id=76db4fe6&scoped=true& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -138,9 +162,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 186:
+<<<<<<< HEAD
 /*!***********************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=script&lang=js& ***!
   \***********************************************************************************************/
+=======
+/*!*******************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -154,9 +184,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 187:
+<<<<<<< HEAD
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=script&lang=js& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -302,9 +338,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 188:
+<<<<<<< HEAD
 /*!********************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=style&index=0&id=76db4fe6&scoped=true&lang=scss& ***!
   \********************************************************************************************************************************/
+=======
+/*!****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=style&index=0&id=76db4fe6&scoped=true&lang=scss& ***!
+  \****************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -318,9 +360,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 189:
+<<<<<<< HEAD
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/count/setting.vue?vue&type=style&index=0&id=76db4fe6&scoped=true&lang=scss& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/count/setting.vue?vue&type=style&index=0&id=76db4fe6&scoped=true&lang=scss& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/me/menudetail.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/me/menudetail"],{
 
 /***/ 230:
-/*!*****************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fme%2Fmenudetail"} ***!
-  \*****************************************************************************************/
+/*!*************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fme%2Fmenudetail"} ***!
+  \*************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_menudetail.default);
 /***/ }),
 
 /***/ 231:
-/*!**********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue ***!
-  \**********************************************************************/
+/*!******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "Food/me/menudetail.vue"
 /***/ }),
 
 /***/ 232:
-/*!*****************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=template&id=68b9a684&scoped=true& ***!
-  \*****************************************************************************************************************/
+/*!*************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=template&id=68b9a684&scoped=true& ***!
+  \*************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 233:
-/*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=template&id=68b9a684&scoped=true& ***!
-  \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=template&id=68b9a684&scoped=true& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -175,9 +175,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 234:
-/*!***********************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=script&lang=js& ***!
-  \***********************************************************************************************/
+/*!*******************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -191,9 +191,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 235:
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -433,9 +433,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 236:
-/*!********************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=style&index=0&id=68b9a684&lang=scss&scoped=true& ***!
-  \********************************************************************************************************************************/
+/*!****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=style&index=0&id=68b9a684&lang=scss&scoped=true& ***!
+  \****************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -449,9 +449,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 237:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/menudetail.vue?vue&type=style&index=0&id=68b9a684&lang=scss&scoped=true& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/menudetail.vue?vue&type=style&index=0&id=68b9a684&lang=scss&scoped=true& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/me/mymenu.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/me/mymenu"],{
 
 /***/ 238:
-/*!*************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fme%2Fmymenu"} ***!
-  \*************************************************************************************/
+/*!*********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fme%2Fmymenu"} ***!
+  \*********************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_mymenu.default);
 /***/ }),
 
 /***/ 239:
-/*!******************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue ***!
-  \******************************************************************/
+/*!**************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue ***!
+  \**************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "Food/me/mymenu.vue"
 /***/ }),
 
 /***/ 240:
-/*!*************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=template&id=7c98019f&scoped=true& ***!
-  \*************************************************************************************************************/
+/*!*********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=template&id=7c98019f&scoped=true& ***!
+  \*********************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 241:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=template&id=7c98019f&scoped=true& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=template&id=7c98019f&scoped=true& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -125,9 +125,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 242:
-/*!*******************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -141,9 +141,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 243:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=script&lang=js& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -244,9 +244,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 244:
-/*!****************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=style&index=0&id=7c98019f&lang=scss&scoped=true& ***!
-  \****************************************************************************************************************************/
+/*!************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=style&index=0&id=7c98019f&lang=scss&scoped=true& ***!
+  \************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -260,9 +260,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 245:
-/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/mymenu.vue?vue&type=style&index=0&id=7c98019f&lang=scss&scoped=true& ***!
-  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/mymenu.vue?vue&type=style&index=0&id=7c98019f&lang=scss&scoped=true& ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/me/record.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/me/record"],{
 
 /***/ 246:
+<<<<<<< HEAD
 /*!*************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fme%2Frecord"} ***!
   \*************************************************************************************/
+=======
+/*!*********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fme%2Frecord"} ***!
+  \*********************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_record.default);
 /***/ }),
 
 /***/ 247:
+<<<<<<< HEAD
 /*!******************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue ***!
   \******************************************************************/
+=======
+/*!**************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue ***!
+  \**************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "Food/me/record.vue"
 /***/ }),
 
 /***/ 248:
+<<<<<<< HEAD
 /*!*************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=template&id=96762436&scoped=true& ***!
   \*************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=template&id=96762436&scoped=true& ***!
+  \*********************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 249:
+<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=template&id=96762436&scoped=true& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=template&id=96762436&scoped=true& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -144,9 +168,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 250:
+<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************/
+=======
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -160,9 +190,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 251:
+<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=script&lang=js& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -242,9 +278,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 252:
+<<<<<<< HEAD
 /*!******************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=style&index=0&id=96762436&scoped=scoped&lang=scss& ***!
   \******************************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=style&index=0&id=96762436&scoped=scoped&lang=scss& ***!
+  \**************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -258,9 +300,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 253:
+<<<<<<< HEAD
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/record.vue?vue&type=style&index=0&id=96762436&scoped=scoped&lang=scss& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/record.vue?vue&type=style&index=0&id=96762436&scoped=scoped&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/me/recordetail.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/me/recordetail"],{
 
 /***/ 254:
-/*!******************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fme%2Frecordetail"} ***!
-  \******************************************************************************************/
+/*!**************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fme%2Frecordetail"} ***!
+  \**************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_recordetail.default);
 /***/ }),
 
 /***/ 255:
-/*!***********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/recordetail.vue ***!
-  \***********************************************************************/
+/*!*******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/recordetail.vue ***!
+  \*******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -61,9 +61,9 @@ component.options.__file = "Food/me/recordetail.vue"
 /***/ }),
 
 /***/ 256:
-/*!******************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/recordetail.vue?vue&type=template&id=e24451c0&scoped=true& ***!
-  \******************************************************************************************************************/
+/*!**************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/recordetail.vue?vue&type=template&id=e24451c0&scoped=true& ***!
+  \**************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -83,9 +83,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 257:
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/recordetail.vue?vue&type=template&id=e24451c0&scoped=true& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/recordetail.vue?vue&type=template&id=e24451c0&scoped=true& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,9 +110,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 258:
-/*!************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/recordetail.vue?vue&type=script&lang=js& ***!
-  \************************************************************************************************/
+/*!********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/recordetail.vue?vue&type=script&lang=js& ***!
+  \********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -126,9 +126,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 259:
-/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/me/recordetail.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/me/recordetail.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/search/list.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/search/list"],{
 
 /***/ 222:
-/*!***************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fsearch%2Flist"} ***!
-  \***************************************************************************************/
+/*!***********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fsearch%2Flist"} ***!
+  \***********************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_list.default);
 /***/ }),
 
 /***/ 223:
-/*!********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue ***!
-  \********************************************************************/
+/*!****************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue ***!
+  \****************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "Food/search/list.vue"
 /***/ }),
 
 /***/ 224:
-/*!***************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=template&id=3d7d9bbc&scoped=true& ***!
-  \***************************************************************************************************************/
+/*!***********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=template&id=3d7d9bbc&scoped=true& ***!
+  \***********************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 225:
-/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=template&id=3d7d9bbc&scoped=true& ***!
-  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=template&id=3d7d9bbc&scoped=true& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -146,9 +146,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 226:
-/*!*********************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=script&lang=js& ***!
-  \*********************************************************************************************/
+/*!*****************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=script&lang=js& ***!
+  \*****************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -162,9 +162,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 227:
-/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=script&lang=js& ***!
-  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=script&lang=js& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -255,9 +255,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 228:
-/*!******************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=style&index=0&id=3d7d9bbc&scoped=true&lang=scss& ***!
-  \******************************************************************************************************************************/
+/*!**************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=style&index=0&id=3d7d9bbc&scoped=true&lang=scss& ***!
+  \**************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -271,9 +271,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 229:
-/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/list.vue?vue&type=style&index=0&id=3d7d9bbc&scoped=true&lang=scss& ***!
-  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/list.vue?vue&type=style&index=0&id=3d7d9bbc&scoped=true&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/Food/search/search.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["Food/search/search"],{
 
 /***/ 214:
-/*!*****************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"Food%2Fsearch%2Fsearch"} ***!
-  \*****************************************************************************************/
+/*!*************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"Food%2Fsearch%2Fsearch"} ***!
+  \*************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_search.default);
 /***/ }),
 
 /***/ 215:
-/*!**********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue ***!
-  \**********************************************************************/
+/*!******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "Food/search/search.vue"
 /***/ }),
 
 /***/ 216:
-/*!*****************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=template&id=d6d0f1a8&scoped=true& ***!
-  \*****************************************************************************************************************/
+/*!*************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=template&id=d6d0f1a8&scoped=true& ***!
+  \*************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 217:
-/*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=template&id=d6d0f1a8&scoped=true& ***!
-  \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=template&id=d6d0f1a8&scoped=true& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -160,9 +160,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 218:
-/*!***********************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=script&lang=js& ***!
-  \***********************************************************************************************/
+/*!*******************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -176,9 +176,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 219:
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -284,9 +284,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 220:
-/*!********************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=style&index=0&id=d6d0f1a8&lang=scss&scoped=true& ***!
-  \********************************************************************************************************************************/
+/*!****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=style&index=0&id=d6d0f1a8&lang=scss&scoped=true& ***!
+  \****************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -300,9 +300,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 221:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/Food/search/search.vue?vue&type=style&index=0&id=d6d0f1a8&lang=scss&scoped=true& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/Food/search/search.vue?vue&type=style&index=0&id=d6d0f1a8&lang=scss&scoped=true& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/curve/curve.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/curve/curve"],{
 
 /***/ 174:
-/*!***************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fcurve%2Fcurve"} ***!
-  \***************************************************************************************/
+/*!***********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fcurve%2Fcurve"} ***!
+  \***********************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_curve.default);
 /***/ }),
 
 /***/ 175:
-/*!********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue ***!
-  \********************************************************************/
+/*!****************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue ***!
+  \****************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/curve/curve.vue"
 /***/ }),
 
 /***/ 176:
-/*!***************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=template&id=42e2b170&scoped=true& ***!
-  \***************************************************************************************************************/
+/*!***********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=template&id=42e2b170&scoped=true& ***!
+  \***********************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 177:
-/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=template&id=42e2b170&scoped=true& ***!
-  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=template&id=42e2b170&scoped=true& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -169,9 +169,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 178:
-/*!*********************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=script&lang=js& ***!
-  \*********************************************************************************************/
+/*!*****************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=script&lang=js& ***!
+  \*****************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -185,9 +185,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 179:
-/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=script&lang=js& ***!
-  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=script&lang=js& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -356,9 +356,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 180:
-/*!******************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=style&index=0&id=42e2b170&scoped=true&lang=scss& ***!
-  \******************************************************************************************************************************/
+/*!**************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=style&index=0&id=42e2b170&scoped=true&lang=scss& ***!
+  \**************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -372,9 +372,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 181:
-/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/curve/curve.vue?vue&type=style&index=0&id=42e2b170&scoped=true&lang=scss& ***!
-  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/curve/curve.vue?vue&type=style&index=0&id=42e2b170&scoped=true&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/history/history.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/history/history"],{
 
 /***/ 144:
-/*!*******************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fhistory%2Fhistory"} ***!
-  \*******************************************************************************************/
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fhistory%2Fhistory"} ***!
+  \***************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_history.default);
 /***/ }),
 
 /***/ 145:
-/*!************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue ***!
-  \************************************************************************/
+/*!********************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue ***!
+  \********************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/history/history.vue"
 /***/ }),
 
 /***/ 146:
-/*!*******************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=template&id=0bebab8c&scoped=true& ***!
-  \*******************************************************************************************************************/
+/*!***************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=template&id=0bebab8c&scoped=true& ***!
+  \***************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 147:
-/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=template&id=0bebab8c&scoped=true& ***!
-  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=template&id=0bebab8c&scoped=true& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -152,9 +152,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 148:
-/*!*************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************/
+/*!*********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=script&lang=js& ***!
+  \*********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -168,9 +168,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 149:
-/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=script&lang=js& ***!
-  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=script&lang=js& ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -289,9 +289,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 150:
-/*!************************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=style&index=0&id=0bebab8c&scoped=scoped&lang=scss& ***!
-  \************************************************************************************************************************************/
+/*!********************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=style&index=0&id=0bebab8c&scoped=scoped&lang=scss& ***!
+  \********************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -305,9 +305,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 151:
-/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/history.vue?vue&type=style&index=0&id=0bebab8c&scoped=scoped&lang=scss& ***!
-  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/history.vue?vue&type=style&index=0&id=0bebab8c&scoped=scoped&lang=scss& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/history/historyDetail.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/history/historyDetail"],{
 
 /***/ 152:
-/*!*************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fhistory%2FhistoryDetail"} ***!
-  \*************************************************************************************************/
+/*!*********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fhistory%2FhistoryDetail"} ***!
+  \*********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_historyDetail.default);
 /***/ }),
 
 /***/ 153:
-/*!******************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue ***!
-  \******************************************************************************/
+/*!**************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue ***!
+  \**************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/history/historyDetail.vue"
 /***/ }),
 
 /***/ 154:
-/*!*************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=template&id=2febccab&scoped=true& ***!
-  \*************************************************************************************************************************/
+/*!*********************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=template&id=2febccab&scoped=true& ***!
+  \*********************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 155:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=template&id=2febccab&scoped=true& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=template&id=2febccab&scoped=true& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -112,9 +112,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 156:
-/*!*******************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************************/
+/*!***************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -128,9 +128,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 157:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=script&lang=js& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -198,9 +198,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 158:
-/*!******************************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=style&index=0&id=2febccab&scoped=scoped&lang=scss& ***!
-  \******************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=style&index=0&id=2febccab&scoped=scoped&lang=scss& ***!
+  \**************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -214,9 +214,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 159:
-/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/history/historyDetail.vue?vue&type=style&index=0&id=2febccab&scoped=scoped&lang=scss& ***!
-  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/history/historyDetail.vue?vue&type=style&index=0&id=2febccab&scoped=scoped&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/home/body.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/home/body"],{
 
 /***/ 80:
-/*!*************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fhome%2Fbody"} ***!
-  \*************************************************************************************/
+/*!*********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fhome%2Fbody"} ***!
+  \*********************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_body.default);
 /***/ }),
 
 /***/ 81:
-/*!******************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue ***!
-  \******************************************************************/
+/*!**************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue ***!
+  \**************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/home/body.vue"
 /***/ }),
 
 /***/ 82:
-/*!*************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=template&id=69723733&scoped=true& ***!
-  \*************************************************************************************************************/
+/*!*********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=template&id=69723733&scoped=true& ***!
+  \*********************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 83:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=template&id=69723733&scoped=true& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=template&id=69723733&scoped=true& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -147,9 +147,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 84:
-/*!*******************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -163,9 +163,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 85:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=script&lang=js& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -247,9 +247,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 86:
-/*!****************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=style&index=0&id=69723733&scoped=true&lang=scss& ***!
-  \****************************************************************************************************************************/
+/*!************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=style&index=0&id=69723733&scoped=true&lang=scss& ***!
+  \************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -263,9 +263,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 87:
-/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/home/body.vue?vue&type=style&index=0&id=69723733&scoped=true&lang=scss& ***!
-  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/home/body.vue?vue&type=style&index=0&id=69723733&scoped=true&lang=scss& ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/login/forgetPassword.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/login/forgetPassword"],{
 
 /***/ 64:
-/*!************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Flogin%2FforgetPassword"} ***!
-  \************************************************************************************************/
+/*!********************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Flogin%2FforgetPassword"} ***!
+  \********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_forgetPassword.default);
 /***/ }),
 
 /***/ 65:
-/*!*****************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue ***!
-  \*****************************************************************************/
+/*!*************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue ***!
+  \*************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/login/forgetPassword.vue"
 /***/ }),
 
 /***/ 66:
-/*!************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=template&id=2ac05386&scoped=true& ***!
-  \************************************************************************************************************************/
+/*!********************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=template&id=2ac05386&scoped=true& ***!
+  \********************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 67:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=template&id=2ac05386&scoped=true& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=template&id=2ac05386&scoped=true& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -112,9 +112,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 68:
-/*!******************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************************************/
+/*!**************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -128,9 +128,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 69:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=script&lang=js& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -306,9 +306,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 70:
-/*!***************************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=style&index=0&id=2ac05386&scoped=true&lang=scss& ***!
-  \***************************************************************************************************************************************/
+/*!***********************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=style&index=0&id=2ac05386&scoped=true&lang=scss& ***!
+  \***********************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -322,9 +322,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 71:
-/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/forgetPassword.vue?vue&type=style&index=0&id=2ac05386&scoped=true&lang=scss& ***!
-  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/forgetPassword.vue?vue&type=style&index=0&id=2ac05386&scoped=true&lang=scss& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/login/login.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/login/login"],{
 
 /***/ 72:
+<<<<<<< HEAD
 /*!***************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Flogin%2Flogin"} ***!
   \***************************************************************************************/
+=======
+/*!***********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Flogin%2Flogin"} ***!
+  \***********************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_login.default);
 /***/ }),
 
 /***/ 73:
+<<<<<<< HEAD
 /*!********************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue ***!
   \********************************************************************/
+=======
+/*!****************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue ***!
+  \****************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "body/login/login.vue"
 /***/ }),
 
 /***/ 74:
+<<<<<<< HEAD
 /*!***************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=template&id=245670e4&scoped=true& ***!
   \***************************************************************************************************************/
+=======
+/*!***********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=template&id=245670e4&scoped=true& ***!
+  \***********************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 75:
+<<<<<<< HEAD
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=template&id=245670e4&scoped=true& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=template&id=245670e4&scoped=true& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -112,9 +136,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 76:
+<<<<<<< HEAD
 /*!*********************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************/
+=======
+/*!*****************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=script&lang=js& ***!
+  \*****************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -128,9 +158,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 77:
+<<<<<<< HEAD
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=script&lang=js& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -381,9 +417,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 78:
+<<<<<<< HEAD
 /*!******************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=style&index=0&id=245670e4&scoped=true&lang=scss& ***!
   \******************************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=style&index=0&id=245670e4&scoped=true&lang=scss& ***!
+  \**************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -397,9 +439,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 79:
+<<<<<<< HEAD
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/login/login.vue?vue&type=style&index=0&id=245670e4&scoped=true&lang=scss& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/login/login.vue?vue&type=style&index=0&id=245670e4&scoped=true&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/my/about.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/my/about"],{
 
 /***/ 104:
+<<<<<<< HEAD
 /*!************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fmy%2Fabout"} ***!
   \************************************************************************************/
+=======
+/*!********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fmy%2Fabout"} ***!
+  \********************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_about.default);
 /***/ }),
 
 /***/ 105:
+<<<<<<< HEAD
 /*!*****************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue ***!
   \*****************************************************************/
+=======
+/*!*************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue ***!
+  \*************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "body/my/about.vue"
 /***/ }),
 
 /***/ 106:
+<<<<<<< HEAD
 /*!************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=template&id=37897dce&scoped=true& ***!
   \************************************************************************************************************/
+=======
+/*!********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=template&id=37897dce&scoped=true& ***!
+  \********************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 107:
+<<<<<<< HEAD
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=template&id=37897dce&scoped=true& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=template&id=37897dce&scoped=true& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -135,9 +159,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 108:
+<<<<<<< HEAD
 /*!******************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=script&lang=js& ***!
   \******************************************************************************************/
+=======
+/*!**************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -151,9 +181,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 109:
+<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=script&lang=js& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -254,9 +290,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 110:
+<<<<<<< HEAD
 /*!***************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=style&index=0&id=37897dce&scoped=true&lang=scss& ***!
   \***************************************************************************************************************************/
+=======
+/*!***********************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=style&index=0&id=37897dce&scoped=true&lang=scss& ***!
+  \***********************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -270,9 +312,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 111:
+<<<<<<< HEAD
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/about.vue?vue&type=style&index=0&id=37897dce&scoped=true&lang=scss& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/about.vue?vue&type=style&index=0&id=37897dce&scoped=true&lang=scss& ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/my/manage.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/my/manage"],{
 
 /***/ 100:
+<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************/
+=======
+/*!***************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=script&lang=js& ***!
+  \***************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -17,9 +23,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 101:
+<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=script&lang=js& ***!
+  \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -130,9 +142,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 102:
+<<<<<<< HEAD
 /*!******************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=style&index=0&id=35996aee&scoped=scoped&lang=scss& ***!
   \******************************************************************************************************************************/
+=======
+/*!**************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=style&index=0&id=35996aee&scoped=scoped&lang=scss& ***!
+  \**************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -146,9 +164,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 103:
+<<<<<<< HEAD
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=style&index=0&id=35996aee&scoped=scoped&lang=scss& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=style&index=0&id=35996aee&scoped=scoped&lang=scss& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -159,9 +183,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 96:
+<<<<<<< HEAD
 /*!*************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fmy%2Fmanage"} ***!
   \*************************************************************************************/
+=======
+/*!*********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fmy%2Fmanage"} ***!
+  \*********************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -180,9 +210,15 @@ createPage(_manage.default);
 /***/ }),
 
 /***/ 97:
+<<<<<<< HEAD
 /*!******************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue ***!
   \******************************************************************/
+=======
+/*!**************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue ***!
+  \**************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -221,9 +257,15 @@ component.options.__file = "body/my/manage.vue"
 /***/ }),
 
 /***/ 98:
+<<<<<<< HEAD
 /*!*************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=template&id=35996aee&scoped=true& ***!
   \*************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=template&id=35996aee&scoped=true& ***!
+  \*********************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -243,9 +285,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 99:
+<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/manage.vue?vue&type=template&id=35996aee&scoped=true& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/manage.vue?vue&type=template&id=35996aee&scoped=true& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/my/userInfo.js

@@ -1,9 +1,15 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/my/userInfo"],{
 
 /***/ 88:
+<<<<<<< HEAD
 /*!***************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Fmy%2FuserInfo"} ***!
   \***************************************************************************************/
+=======
+/*!***********************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Fmy%2FuserInfo"} ***!
+  \***********************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +28,15 @@ createPage(_userInfo.default);
 /***/ }),
 
 /***/ 89:
+<<<<<<< HEAD
 /*!********************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue ***!
   \********************************************************************/
+=======
+/*!****************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue ***!
+  \****************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +75,15 @@ component.options.__file = "body/my/userInfo.vue"
 /***/ }),
 
 /***/ 90:
+<<<<<<< HEAD
 /*!***************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=template&id=6be4873d&scoped=true& ***!
   \***************************************************************************************************************/
+=======
+/*!***********************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=template&id=6be4873d&scoped=true& ***!
+  \***********************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +103,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 91:
+<<<<<<< HEAD
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=template&id=6be4873d&scoped=true& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=template&id=6be4873d&scoped=true& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -152,9 +176,15 @@ render._withStripped = true
 /***/ }),
 
 /***/ 92:
+<<<<<<< HEAD
 /*!*********************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************/
+=======
+/*!*****************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=script&lang=js& ***!
+  \*****************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -168,9 +198,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 93:
+<<<<<<< HEAD
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=script&lang=js& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -332,9 +368,15 @@ exports.default = _default;
 /***/ }),
 
 /***/ 94:
+<<<<<<< HEAD
 /*!********************************************************************************************************************************!*\
   !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=style&index=0&id=6be4873d&scoped=scoped&lang=scss& ***!
   \********************************************************************************************************************************/
+=======
+/*!****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=style&index=0&id=6be4873d&scoped=scoped&lang=scss& ***!
+  \****************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -348,9 +390,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 95:
+<<<<<<< HEAD
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/my/userInfo.vue?vue&type=style&index=0&id=6be4873d&scoped=scoped&lang=scss& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/my/userInfo.vue?vue&type=style&index=0&id=6be4873d&scoped=scoped&lang=scss& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 2a4300b000c59acc56b7e16114edae5d808fa54a
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/body/report/report.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["body/report/report"],{
 
 /***/ 166:
-/*!*****************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/main.js?{"page":"body%2Freport%2Freport"} ***!
-  \*****************************************************************************************/
+/*!*************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/main.js?{"page":"body%2Freport%2Freport"} ***!
+  \*************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_report.default);
 /***/ }),
 
 /***/ 167:
-/*!**********************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue ***!
-  \**********************************************************************/
+/*!******************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -63,9 +63,9 @@ component.options.__file = "body/report/report.vue"
 /***/ }),
 
 /***/ 168:
-/*!*****************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=template&id=774e29d0&scoped=true& ***!
-  \*****************************************************************************************************************/
+/*!*************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=template&id=774e29d0&scoped=true& ***!
+  \*************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -85,9 +85,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 169:
-/*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=template&id=774e29d0&scoped=true& ***!
-  \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=template&id=774e29d0&scoped=true& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -199,9 +199,9 @@ render._withStripped = true
 /***/ }),
 
 /***/ 170:
-/*!***********************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=script&lang=js& ***!
-  \***********************************************************************************************/
+/*!*******************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -215,9 +215,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 171:
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -335,9 +335,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 172:
-/*!********************************************************************************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=style&index=0&id=774e29d0&scoped=true&lang=scss& ***!
-  \********************************************************************************************************************************/
+/*!****************************************************************************************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=style&index=0&id=774e29d0&scoped=true&lang=scss& ***!
+  \****************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -351,9 +351,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 173:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodApp/body/report/report.vue?vue&type=style&index=0&id=774e29d0&scoped=true&lang=scss& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/qiaocongli/小程序/中招体测app/ReedawFoodAppLanguage/body/report/report.vue?vue&type=style&index=0&id=774e29d0&scoped=true&lang=scss& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {