chen
/
flying-monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改冲突

master
chen 2022-05-20 18:12:27 +08:00
parent 6f0f2c2eac 44b021d84a
commit 8ae783ebe4
9 changed files with 641 additions and 719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
index.html Normal file
View File

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<script>
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
CSS.supports('top: constant(a)'))
document.write(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
</script>
<title></title>
<!--preload-links-->
<!--app-context-->
</head>
<body>
<div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script>
</body>
</html>

121
manifest.json
View File

@ -1,32 +1,41 @@
{ {
"name" : "飞猴", "name" : "飞猴云服务",
"appid" : "__UNI__25FB71A", "appid" : "__UNI__BDCAFA5",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */
"app-plus" : { "app-plus" : {
"usingComponents" : true, "usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3, "compilerVersion" : 3,
/* 5+App特有相关 */ "splashscreen" : {
"modules" : {}, "alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* 模块配置 */ /* 模块配置 */
"modules" : {
"Maps" : {}
},
/* 应用发布信息 */
"distribute" : { "distribute" : {
/* 应用发布信息 */ /* android打包配置 */
"android" : { "android" : {
/* android打包配置 */
"permissions" : [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.GET_TASKS\"/>", "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
@ -34,84 +43,50 @@
"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
"ios" : {
"privacyDescription" : {
"NSLocationWhenInUseUsageDescription" : ""
},
"capabilities" : {
"entitlements" : {
"com.apple.developer.associated-domains" : [ "applinks:static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com" ]
}
}
},
/* ios打包配置 */ /* ios打包配置 */
"ios" : {},
/* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
"ad" : {},
"maps" : { "maps" : {
"amap" : { "amap" : {
"appkey_ios" : "", "appkey_ios" : "",
"appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf" "appkey_android" : ""
} }
}, }
"payment" : {
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wx2654bc27c419ada6",
"UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
}
},
"push" : {},
"geolocation" : {
"system" : {
"__platform__" : [ "ios", "android" ]
},
"baidu" : {
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "",
"appkey_android" : "mDcZsWM7gGKb7MC1bC8Mo33FScjYEr0I"
},
"amap" : {
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "",
"appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
}
},
"share" : {
"weixin" : {
"appid" : "wx2654bc27c419ada6",
"UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
}
},
"ad" : {}
} }
},
"splashscreen" : {
"alwaysShowBeforeRender" : false,
"waiting" : false
} }
}, },
/* SDK配置 */
"quickapp" : {},
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
/* 小程序特有相关 */
"appid" : "wx372ffc194d87c693", "appid" : "wx372ffc194d87c693",
"setting" : { "setting" : {
"urlCheck" : true, "urlCheck" : false
"es6" : true
}, },
"usingComponents" : true, "usingComponents" : true
"permission" : {
"scope.userLocation" : {
"desc" : "您的位置信息将用于小程序位置接口的效果展示"
}
}
}, },
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics" : {
"enable" : false
},
"vueVersion" : "2",
"h5" : { "h5" : {
"sdkConfigs" : { "sdkConfigs" : {
"maps" : { "maps" : {
@ -135,9 +110,5 @@
} }
} }
} }
}, }
"mp-baidu" : {
"appid" : "24346353"
},
"_spaceID" : "c27fa8d7-ef72-4327-ab9b-d4787a747ee3"
} }

12
package-lock.json generated Normal file
View File

@ -0,0 +1,12 @@
{
"name": "轮播视频和图片",
"version": "1.0.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "轮播视频和图片",
"version": "1.0.1"
}
}
}

2
pages/guide-page/guide-page.vue
View File

@ -24,7 +24,7 @@
methods: { methods: {
checkContext(){ checkContext(){
if(uni.getStorageSync('password')) { if(uni.getStorageSync('password')) {
// 是否登录过，登录过就直接刷新token重新登录 // 是否登录过，登录过就直接刷新token重新登录
let params = { let params = {
login_type: 'account', // 登陆手机类型： mobile：手机登陆、account：账号密码登陆 login_type: 'account', // 登陆手机类型： mobile：手机登陆、account：账号密码登陆
phone: '', // 手机号码，login_type 为 mobile 时必填 phone: '', // 手机号码，login_type 为 mobile 时必填

2
pagesA/faultStatistics/faultStatistics.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="content"> <view class="content">
<statusNav navBarTitle="维保统计" returnColor="#c2c2c2"></statusNav> <statusNav navBarTitle="维保统计" returnColor="#c2c2c2"></statusNav>
<container-subgroup-two> <container-subgroup-two>
<view slot="content" style="margin: 0 -30rpx;"> <view slot="content" style="margin: 0 -30rpx;">
<view class="faultStatistics-nav"> <view class="faultStatistics-nav">

111
pagesA/repairsPage/repairsPage.vue
View File

@ -1,64 +1,55 @@
<template> <template>
<view class="content"> <view class="content">
<status-nav navBarTitle="添加报修" returnColor="#c2c2c2"></status-nav> <status-nav navBarTitle="添加报修" returnColor="#c2c2c2"></status-nav>
<container-subgroup> <container-subgroup>
<view slot="content" style="margin: 0 -30rpx;"> <view slot="content" style="margin: 0 -30rpx;">
<view class="repairs-nav" style="margin-top: -30rpx;"> <view class="repairs-nav" style="margin-top: -30rpx;">
<view class="li" @click="repairsNavFun(index)" :class="current==index ?'on':''" <view class="li" @click="repairsNavFun(index)" :class="current==index ?'on':''"
v-for="(item,index) in navDataState" :key="index"> v-for="(item,index) in navDataState" :key="index">
{{item}} {{item}}
</view> </view>
</view> </view>
<view class="repairs-hint padding"> <view class="repairs-hint padding">
<image class="icon" src="../../static/iocn/lp.png" mode="aspectFill"></image> <image class="icon" src="../../static/iocn/lp.png" mode="aspectFill"></image>
<view class="text"> <view class="text">
请务必拍好维保照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。 请务必拍好维保照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
</view> </view>
</view> </view>
<view class="fault-type-title padding">维保类型：</view> <view class="fault-type-title padding">维保类型：</view>
<view class="padding fault-type-content"> <view class="padding fault-type-content">
<view class="li" @click="repairsTypeFun(index)" :class="index==indexType?'on':''" <view class="li" @click="repairsTypeFun(index)" :class="index==indexType?'on':''"
v-for="(item,index) in faultTypeData" :key="index"> v-for="(item,index) in faultTypeData" :key="index">
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
<view class="padding"> <view class="padding">
<view class="devicename" v-if="current==0"> <view class="devicename" v-if="current==0">
<input type="text" class="fon28 width100 col3" v-model="data.project_number" <input type="text" class="fon28 width100 col3" v-model="data.project_number" placeholder="请填写设备编号或扫描二维码" />
placeholder="请填写设备编号或扫描二维码" /> <image @click="scanCodeFun" class="sm flexs" src="../../static/iocn/sm.png" lazy-load mode=""></image>
<image @click="scanCodeFun" class="sm flexs" src="../../static/iocn/sm.png" lazy-load mode=""> </view>
</image> <input v-else v-model="data.device_name" class="devicename" placeholder="请填写设备名称和型号（例:华为LED）" />
</view> <view class="fault-pictures radius10" @click="chooseImg">
<input v-else v-model="data.device_name" class="devicename" placeholder="请填写设备名称和型号（例:华为LED）" /> <image class="fault-pictures-img" v-if="imgsrcArr.length>=1" :src="imgsrcArr[0]" mode="aspectFill"></image>
<view class="fault-pictures radius10" @click="chooseImg"> <view class="fault-pictures-con" v-else>
<image class="fault-pictures-img" v-if="imgsrcArr.length>=1" :src="imgsrcArr[0]" <image class="img" src="../../static/iocn/gz.png" lazy-load mode="aspectFill"></image>
mode="aspectFill"></image> <view class="text">添加维保图片</view>
<view class="fault-pictures-con" v-else> </view>
<image class="img" src="../../static/iocn/gz.png" lazy-load mode="aspectFill"></image> </view>
<view class="text">添加维保图片</view> <textarea v-model="data.fault_describe" class="fault-description radius10" placeholder="维保情况描述"
</view> placeholder-class="fault-description-text" />
</view> <view class="detailed-address inputCss">
<textarea v-model="data.fault_describe" class="fault-description radius10" placeholder="维保情况描述" <input type="text" v-model="data.service_address" class="fon26 width100 mar-y20" placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" />
placeholder-class="fault-description-text" /> <image @click="mapFun" src="../../static/iocn/map.png" class="map flexs" mode="aspectFill"></image>
<view class="detailed-address inputCss"> </view>
<input type="text" v-model="data.service_address" class="fon26 width100 mar-y20" <input type="text" class="inputCss" v-model="data.username" placeholder="请填写您的姓名" placeholder-class="inputCss-input" />
placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" /> <input type="number" maxlength="11" class="inputCss" v-model="data.phone" placeholder="请填写联系电话" placeholder-class="inputCss-input" />
<image @click="mapFun" src="../../static/iocn/map.png" class="map flexs" mode="aspectFill"> <input type="text" class="inputCss" @tap="openDatetimePicker" disabled v-model="data.visit_time" placeholder="请选择上门时间" placeholder-class="inputCss-input" />
</image> <yy-mm-dd-hh-ss ref="myPicker" @submit="handleSubmit" :start-year="2022" :end-year="2122"></yy-mm-dd-hh-ss>
</view> <button class="submit-button" @click="submitButton()" type="default">提交维保申报</button>
<input type="text" class="inputCss" v-model="data.username" placeholder="请填写您的姓名" </view>
placeholder-class="inputCss-input" /> </view>
<input type="number" maxlength="11" class="inputCss" v-model="data.phone" placeholder="请填写联系电话" </container-subgroup>
placeholder-class="inputCss-input" /> </view>
<input type="text" class="inputCss" @tap="openDatetimePicker" disabled v-model="data.visit_time"
placeholder="请选择上门时间" placeholder-class="inputCss-input" />
<yy-mm-dd-hh-ss ref="myPicker" @submit="handleSubmit" :start-year="2022" :end-year="2122">
</yy-mm-dd-hh-ss>
<button class="submit-button" @click="submitButton()" type="default">提交维保申报</button>
</view>
</view>
</container-subgroup>
</view>
</template> </template>
<script> <script>

77
project.config.json
View File

@ -1,77 +0,0 @@
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true
},
"compileType": "miniprogram",
"libVersion": "2.22.0",
"appid": "wx987dc41899f719e8",
"projectname": "%E4%BD%A9%E4%B8%BD%E5%95%86%E5%9F%8E",
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"staticServerOptions": {
"baseURL": "",
"servePath": ""
},
"isGameTourist": false,
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"game": {
"list": []
},
"plugin": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": []
}
}
}

36
uni.scss
View File

@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc;
/* 尺寸变量 */ /* 尺寸变量 */
/* 文字尺寸 */ /* 文字尺寸 */
$uni-font-size-sm:24upx; $uni-font-size-sm:12px;
$uni-font-size-base:28upx; $uni-font-size-base:14px;
$uni-font-size-lg:32upx; $uni-font-size-lg:16;
/* 图片尺寸 */ /* 图片尺寸 */
$uni-img-size-sm:40upx; $uni-img-size-sm:20px;
$uni-img-size-base:52upx; $uni-img-size-base:26px;
$uni-img-size-lg:80upx; $uni-img-size-lg:40px;
/* Border Radius */ /* Border Radius */
$uni-border-radius-sm: 4upx; $uni-border-radius-sm: 2px;
$uni-border-radius-base: 6upx; $uni-border-radius-base: 3px;
$uni-border-radius-lg: 12upx; $uni-border-radius-lg: 6px;
$uni-border-radius-circle: 50%; $uni-border-radius-circle: 50%;
/* 水平间距 */ /* 水平间距 */
$uni-spacing-row-sm: 10px; $uni-spacing-row-sm: 5px;
$uni-spacing-row-base: 20upx; $uni-spacing-row-base: 10px;
$uni-spacing-row-lg: 30upx; $uni-spacing-row-lg: 15px;
/* 垂直间距 */ /* 垂直间距 */
$uni-spacing-col-sm: 8upx; $uni-spacing-col-sm: 4px;
$uni-spacing-col-base: 16upx; $uni-spacing-col-base: 8px;
$uni-spacing-col-lg: 24upx; $uni-spacing-col-lg: 12px;
/* 透明度 */ /* 透明度 */
$uni-opacity-disabled: 0.3; // 组件禁用态的透明度 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
/* 文章场景相关 */ /* 文章场景相关 */
$uni-color-title: #2C405A; // 文章标题颜色 $uni-color-title: #2C405A; // 文章标题颜色
$uni-font-size-title:40upx; $uni-font-size-title:20px;
$uni-color-subtitle: #555555; // 二级标题颜色 $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:36upx; $uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:30upx; $uni-font-size-paragraph:15px;

979
uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
View File

File diff suppressed because it is too large Load Diff