Browse Source

Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tourGuide

# Conflicts:
#	unpackage/dist/build/web/index.html
#	unpackage/dist/build/web/static/js/index.fb593044.js
master
chenkainan 10 months ago
parent
commit
6b08d471af
  1. 2
      components/SearchHeader.vue
  2. 5
      pages/index/index.vue
  3. 6
      pages/login/login.vue
  4. 16
      pages/user/user.vue
  5. 6
      pages/verification/index.vue
  6. 2
      subPackages/order/orderList.vue
  7. 6
      subPackages/user/changePassword.vue
  8. 5
      subPackages/user/infoFilling.vue
  9. 1
      unpackage/dist/build/web/static/js/pages-index-index.5f9d26d4.js
  10. 1
      unpackage/dist/build/web/static/js/pages-index-index.9b195883.js
  11. 1
      unpackage/dist/build/web/static/js/pages-login-login.1abc0abf.js
  12. 1
      unpackage/dist/build/web/static/js/pages-login-login.c1dfa190.js
  13. 1
      unpackage/dist/build/web/static/js/pages-user-user.57c7c125.js
  14. 1
      unpackage/dist/build/web/static/js/pages-user-user.f62f8ca6.js
  15. 4
      unpackage/dist/build/web/static/js/pages-verification-index.5e3e3242.js
  16. 1
      unpackage/dist/build/web/static/js/subPackages-order-orderList.289075d4.js
  17. 1
      unpackage/dist/build/web/static/js/subPackages-order-orderList.41fbaa27.js
  18. 1
      unpackage/dist/build/web/static/js/subPackages-user-changePassword.5d201403.js
  19. 1
      unpackage/dist/build/web/static/js/subPackages-user-changePassword.dbb5c5ce.js
  20. 3
      unpackage/dist/build/web/static/js/subPackages-user-infoFilling.99660017.js
  21. 3
      unpackage/dist/build/web/static/js/subPackages-user-infoFilling.9c35ff99.js

2
components/SearchHeader.vue

@ -4,7 +4,7 @@
:style="{height:`${height}px`,top:`${height+padHeight}px`,backgroundColor:bgColor || '#FFFFFF'}">
<div class="search-box" :style="{backgroundColor:bgColor ? '#F2F2F2' : '#F2F2F2'}">
<img src="https://static.ticket.sz-trip.com/taizhou/images/search.png" alt="">
<input type="text" class="input" placeholder="请输入想要的产品或服务" v-model="keywords" @confirm="search" />
<input :adjust-position="false" type="text" class="input" placeholder="请输入想要的产品或服务" v-model="keywords" @confirm="search" />
<div class="btn" @click="search()">搜索</div>
</div>
</div>

5
pages/index/index.vue

@ -5,7 +5,7 @@
<view class="title" style="margin-top: 40rpx;">·快捷入口</view>
<view class="flex-between">
<view class="nav-item flex-around">
<view class="nav-item flex-around" @click="goHX()">
立即核销
<image src="https://static.ticket.sz-trip.com/tourGuide/images/index/hexiao.png" mode=""></image>
</view>
@ -89,6 +89,9 @@
this.getList()
},
methods: {
goHX () {
uni.switchTab({url: '/pages/verification/index'})
},
//
switchChange(item, index) {
item.isChecked = !item.isChecked

6
pages/login/login.vue

@ -4,18 +4,18 @@
<view class="item flex-between" style="margin-top: 83rpx;">
<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/phone.png" mode="" class="icon"></image>
<input type="text" v-model="form.username" placeholder="请输入手机号"/>
<input :adjust-position="false" type="text" v-model="form.username" placeholder="请输入手机号"/>
</view>
<view class="item flex-between">
<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/code.png" mode="" class="icon"></image>
<input type="text" v-model="form.captchaCodeId" placeholder="请输入图形验证码"/>
<input :adjust-position="false" type="text" v-model="form.captchaCodeId" placeholder="请输入图形验证码"/>
<image :src="codeImg" mode="" class="code-img" @click="getCodeImg"></image>
</view>
<view class="item flex-between">
<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/password.png" mode="" class="icon"></image>
<input type="text" :password="showPassword" v-model="form.password" placeholder="请输入密码"/>
<input :adjust-position="false" type="text" :password="showPassword" v-model="form.password" placeholder="请输入密码"/>
<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/eye.png" mode="" class="eye-img" @click="showPassword = false" v-if="showPassword"></image>
<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/closeEye.png" mode="" class="eye-img" @click="showPassword = true" v-else></image>
</view>

16
pages/user/user.vue

@ -28,18 +28,18 @@
data() {
return {
list: [
{
title: '我的消息',
path: '/subPackages/user/myNews'
},
// {
// title: '',
// path: '/subPackages/user/myNews'
// },
{
title: '我的订单',
path: '/subPackages/order/orderList'
},
{
title: '账号密码',
path: '/subPackages/user/accountPassword'
}
// {
// title: '',
// path: '/subPackages/user/accountPassword'
// }
],
userInfo: {group_data: {}}
}

6
pages/verification/index.vue

@ -2,7 +2,7 @@
<view class="content">
<view class="common-box">
<view class="common-types">
<view @click="setType(0)" :class="['common-type',type==0?'active':'']">扫码核销1</view>
<view @click="setType(0)" :class="['common-type',type==0?'active':'']">扫码核销</view>
<view @click="setType(1)" :class="['common-type',type==1?'active':'']">核销码核销</view>
<view @click="setType(2)" :class="['common-type',type==2?'active':'']">手机号核销</view>
</view>
@ -17,7 +17,7 @@
<view class="type1-container" v-show="type==1">
<view class="flex flex-items-center">
<view class="hexiao-text">输入核销码</view>
<input v-model="HXCode" class="hexiao-code" placeholder="请输入内容" />
<input :adjust-position="false" v-model="HXCode" class="hexiao-code" placeholder="请输入内容" />
</view>
<view class="hexiao-btn" @click="verifyByCode">立即核销</view>
</view>
@ -25,7 +25,7 @@
<view v-if="orderList.length<=0">
<view class="flex flex-items-center">
<view class="hexiao-text">输入手机号</view>
<input v-model="HXPhone" class="hexiao-code" placeholder="请输入内容" />
<input :adjust-position="false" v-model="HXPhone" class="hexiao-code" placeholder="请输入内容" />
</view>
<view class="tips">
<view>仅支持查询当日订单 </view>

2
subPackages/order/orderList.vue

@ -2,7 +2,7 @@
<view class="bg">
<!-- <view class="search-box flex-center">
<image src="https://static.ticket.sz-trip.com/tourGuide/images/order/search.png" mode=""></image>
<input type="text" placeholder="输入订单号搜索" v-model="keywords" />
<input :adjust-position="false" type="text" placeholder="输入订单号搜索" v-model="keywords" />
<view class="search-btn" @click="getList">
搜索
</view>

6
subPackages/user/changePassword.vue

@ -11,7 +11,7 @@
<view class="item flex-between">
<view>短信验证码</view>
<view class="flex">
<input type="text" v-model="verifyCode">
<input :adjust-position="false" type="text" v-model="verifyCode">
<view @click="getMobileCode()" class="getCode">{{ getCodeBtnTxt }}</view>
</view>
</view>
@ -19,13 +19,13 @@
<view class="item flex-between" >
<view>新密码</view>
<view>
<input type="password" v-model="password">
<input :adjust-position="false" type="password" v-model="password">
</view>
</view>
<view class="item flex-between" >
<view>确认密码</view>
<view>
<input type="password" v-model="confirmPassword">
<input :adjust-position="false" type="password" v-model="confirmPassword">
</view>
</view>
</view>

5
subPackages/user/infoFilling.vue

@ -39,7 +39,7 @@
<view class="userinfo-item" v-for="(item,i) in speakText" :key="i">
<span>{{i==0?'主亮点':`副亮点${i}`}}</span>
<view class="point">
<input v-model="item.text" type="text" placeholder="请输入内容" />
<input :adjust-position="false" v-model="item.text" type="text" placeholder="请输入内容" />
<uni-icons v-if="i!=0" class="del-icon" type="trash" size="20" @click.native="delText(i)"></uni-icons>
</view>
@ -84,7 +84,7 @@
</view>
<view class="nickname-box" v-else>
<input v-model="inputValue" type="text" placeholder="请输入内容" />
<input :adjust-position="false" v-model="inputValue" type="text" placeholder="请输入内容" />
</view>
<!-- 底部保存 -->
@ -369,6 +369,7 @@
uni.showLoading()
uni.chooseVideo({
count:1,
sourceType: ['album'],
success: (res) => {
const tempFilePath = res.tempFilePath;

1
unpackage/dist/build/web/static/js/pages-index-index.5f9d26d4.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-index-index.9b195883.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-login-login.1abc0abf.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-login-login.c1dfa190.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-user-user.57c7c125.js

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-user-user"],{"0e4e":function(t,e,a){"use strict";var i=a("8b22"),n=a.n(i);n.a},"1c2a":function(t,e,a){var i=a("c86c");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */.bg[data-v-101beae0]{min-height:100vh;background:#f5f5f5;padding:%?57?% %?26?% 0}.top-box[data-v-101beae0]{height:%?169?%;background:#fff;border-radius:%?13?%;padding:0 %?34?%}.top-box .top-left[data-v-101beae0]{display:flex;align-items:center}.top-box .top-left .avatar[data-v-101beae0]{width:%?120?%;height:%?120?%;border-radius:50%;margin-right:%?15?%}.top-box .top-left uni-view[data-v-101beae0]{padding:%?15?% 0;justify-content:space-between}.top-box .top-left uni-view .top-title[data-v-101beae0]{font-weight:700;font-size:%?32?%;color:#000}.top-box .top-left uni-view .top-subtitle[data-v-101beae0]{font-weight:500;font-size:%?25?%;color:#000}.top-box .top-right[data-v-101beae0]{font-weight:500;font-size:%?25?%;color:#100e0e;display:flex;align-items:center}.top-box .top-right uni-image[data-v-101beae0]{width:%?11.33?%;height:%?20?%;margin-left:%?19?%}.box[data-v-101beae0]{margin-top:%?28?%;background:#fff;border-radius:%?13?%}.box .flex-between[data-v-101beae0]{height:%?106?%;padding:0 %?26?%}.box .flex-between .title[data-v-101beae0]{font-weight:500;font-size:%?28?%;color:#000}.box .flex-between uni-image[data-v-101beae0]{width:%?11.33?%;height:%?20?%}.box .flex-between[data-v-101beae0]:not(:first-child){border-top:%?1?% solid #d8d8d8}',""]),t.exports=e},"8b22":function(t,e,a){var i=a("1c2a");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=a("967d").default;n("4ed87d6e",i,!0,{sourceMap:!1,shadowMode:!1})},d4b4:function(t,e,a){"use strict";a.r(e);var i=a("d8db"),n=a("f517");for(var o in n)["default"].indexOf(o)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(o);a("0e4e");var s=a("828b"),r=Object(s["a"])(n["default"],i["b"],i["c"],!1,null,"101beae0",null,!1,i["a"],void 0);e["default"]=r.exports},d8db:function(t,e,a){"use strict";a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return n})),a.d(e,"a",(function(){}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"bg"},[a("v-uni-view",{staticClass:"top-box flex-between",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.gotoPath("/subPackages/user/userInfo")}}},[a("v-uni-view",{staticClass:"top-left"},[a("v-uni-image",{staticClass:"avatar",attrs:{src:t.showImg(t.userInfo.avatar||"https://static.ticket.sz-trip.com/tourGuide/images/index/topImg.png"),mode:""}}),a("v-uni-view",{staticClass:"flex-column"},[a("v-uni-view",{staticClass:"top-title"},[t._v(t._s(t.userInfo.nickname))]),a("v-uni-view",{staticClass:"top-subtitle"},[t._v(t._s(t.userInfo.group_data.name))])],1)],1),a("v-uni-view",{staticClass:"top-right"},[t._v("个人信息"),a("v-uni-image",{attrs:{src:"https://static.ticket.sz-trip.com/tourGuide/images/user/rightBlack.png",mode:""}})],1)],1),a("v-uni-view",{staticClass:"box"},t._l(t.list,(function(e,i){return a("v-uni-view",{key:i,staticClass:"flex-between",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.gotoPath(e.path)}}},[a("v-uni-view",{staticClass:"title"},[t._v(t._s(e.title))]),a("v-uni-image",{attrs:{src:"https://static.ticket.sz-trip.com/tourGuide/images/user/rightGray.png",mode:""}})],1)})),1)],1)},n=[]},eff8:function(t,e,a){"use strict";a("6a54"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{list:[{title:"我的订单",path:"/subPackages/order/orderList"}],userInfo:{group_data:{}}}},onShow:function(){var t=this;this.Post({},"/api/Merchants/get_login_details").then((function(e){t.userInfo=e.data}))}}},f517:function(t,e,a){"use strict";a.r(e);var i=a("eff8"),n=a.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){a.d(e,t,(function(){return i[t]}))}(o);e["default"]=n.a}}]);

1
unpackage/dist/build/web/static/js/pages-user-user.f62f8ca6.js

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-user-user"],{1687:function(t,e,a){"use strict";a("6a54"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{list:[{title:"我的订单",path:"/subPackages/order/orderList"}],userInfo:{group_data:{}}}},onShow:function(){var t=this;this.Post({},"/api/Merchants/get_login_details").then((function(e){t.userInfo=e.data}))}}},"2bb0":function(t,e,a){"use strict";a.r(e);var i=a("fc38"),n=a("3d84");for(var o in n)["default"].indexOf(o)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(o);a("83b8");var r=a("828b"),s=Object(r["a"])(n["default"],i["b"],i["c"],!1,null,"101beae0",null,!1,i["a"],void 0);e["default"]=s.exports},"3d84":function(t,e,a){"use strict";a.r(e);var i=a("1687"),n=a.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){a.d(e,t,(function(){return i[t]}))}(o);e["default"]=n.a},"83b8":function(t,e,a){"use strict";var i=a("fe6c"),n=a.n(i);n.a},d6d6:function(t,e,a){var i=a("c86c");e=i(!1),e.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */.bg[data-v-101beae0]{min-height:100vh;background:#f5f5f5;padding:%?57?% %?26?% 0}.top-box[data-v-101beae0]{height:%?169?%;background:#fff;border-radius:%?13?%;padding:0 %?34?%}.top-box .top-left[data-v-101beae0]{display:flex;align-items:center}.top-box .top-left .avatar[data-v-101beae0]{width:%?120?%;height:%?120?%;border-radius:50%;margin-right:%?15?%}.top-box .top-left uni-view[data-v-101beae0]{padding:%?15?% 0;justify-content:space-between}.top-box .top-left uni-view .top-title[data-v-101beae0]{font-weight:700;font-size:%?32?%;color:#000}.top-box .top-left uni-view .top-subtitle[data-v-101beae0]{font-weight:500;font-size:%?25?%;color:#000}.top-box .top-right[data-v-101beae0]{font-weight:500;font-size:%?25?%;color:#100e0e;display:flex;align-items:center}.top-box .top-right uni-image[data-v-101beae0]{width:%?11.33?%;height:%?20?%;margin-left:%?19?%}.box[data-v-101beae0]{margin-top:%?28?%;background:#fff;border-radius:%?13?%}.box .flex-between[data-v-101beae0]{height:%?106?%;padding:0 %?26?%}.box .flex-between .title[data-v-101beae0]{font-weight:500;font-size:%?28?%;color:#000}.box .flex-between uni-image[data-v-101beae0]{width:%?11.33?%;height:%?20?%}.box .flex-between[data-v-101beae0]:not(:first-child){border-top:%?1?% solid #d8d8d8}',""]),t.exports=e},fc38:function(t,e,a){"use strict";a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return n})),a.d(e,"a",(function(){}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"bg"},[a("v-uni-view",{staticClass:"top-box flex-between",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.gotoPath("/subPackages/user/userInfo")}}},[a("v-uni-view",{staticClass:"top-left"},[a("v-uni-image",{staticClass:"avatar",attrs:{src:t.showImg(t.userInfo.avatar||"https://static.ticket.sz-trip.com/tourGuide/images/index/topImg.png"),mode:""}}),a("v-uni-view",{staticClass:"flex-column"},[a("v-uni-view",{staticClass:"top-title"},[t._v(t._s(t.userInfo.nickname))]),a("v-uni-view",{staticClass:"top-subtitle"},[t._v(t._s(t.userInfo.group_data.name))])],1)],1),a("v-uni-view",{staticClass:"top-right"},[t._v("个人信息"),a("v-uni-image",{attrs:{src:"https://static.ticket.sz-trip.com/tourGuide/images/user/rightBlack.png",mode:""}})],1)],1),a("v-uni-view",{staticClass:"box"},t._l(t.list,(function(e,i){return a("v-uni-view",{key:i,staticClass:"flex-between",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.gotoPath(e.path)}}},[a("v-uni-view",{staticClass:"title"},[t._v(t._s(e.title))]),a("v-uni-image",{attrs:{src:"https://static.ticket.sz-trip.com/tourGuide/images/user/rightGray.png",mode:""}})],1)})),1)],1)},n=[]},fe6c:function(t,e,a){var i=a("d6d6");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=a("967d").default;n("9cd60d44",i,!0,{sourceMap:!1,shadowMode:!1})}}]);

4
unpackage/dist/build/web/static/js/pages-verification-index.5e3e3242.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/subPackages-order-orderList.289075d4.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/subPackages-order-orderList.41fbaa27.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/subPackages-user-changePassword.5d201403.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/subPackages-user-changePassword.dbb5c5ce.js

File diff suppressed because one or more lines are too long

3
unpackage/dist/build/web/static/js/subPackages-user-infoFilling.99660017.js

File diff suppressed because one or more lines are too long

3
unpackage/dist/build/web/static/js/subPackages-user-infoFilling.9c35ff99.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save