lilei il y a 4 ans
Parent
commit
833d889af0

+ 6 - 3
pages/shopTour/shopTour.vue

@@ -205,13 +205,16 @@
 					content: '确定提交本次巡店?',
 					success: function(res) {
 						if (res.confirm || res.index == 0) {
-							submitTask({storeId:_this.storeId}).then(ret=>{
+							submitTask({
+								storeId:_this.storeId,
+								taskId: _this.taskId
+							}).then(ret=>{
 								console.log(ret)
 								if(ret.status == 200){
 									_this.isClose = true
 									// 打开完成页面
 									uni.redirectTo({
-										url:"/pages/shopTourCompleted/shopTourCompleted?id="+ret.data.id
+										url:"/pages/shopTourCompleted/shopTourCompleted?taskId="+_this.taskId
 									})
 								}else{
 									_this.isClose = false
@@ -228,7 +231,7 @@
 			// 现场巡店下一步签字
 			nextStep(){
 				uni.navigateTo({
-					url:"/pages/shopTourOver/shopTourOver?storeId="+this.storeId
+					url:"/pages/shopTourOver/shopTourOver?taskId="+this.taskId
 				})
 			}
 		},

+ 32 - 12
pages/shopTourCompleted/shopTourCompleted.vue

@@ -1,44 +1,44 @@
 <template>
-	<view class="shopTourCompleted-wrap">
+	<view class="shopTourCompleted-wrap" v-if="detail">
 		<view class="info-con">
 			<view class="inspection-info">
 				<view class="info-main">
 					<text class="info-tit">门店:</text>
-					<text class="info-val">常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店</text>
+					<text class="info-val">{{detail.storeName}}</text>
 				</view>
 				<view class="info-main">
 					<text class="info-tit">巡店人:</text>
-					<text class="info-val">常青二路店</text>
+					<text class="info-val">{{detail.inspectorName}}</text>
 				</view>
 				<view class="info-main">
 					<text class="info-tit">创建时间:</text>
-					<text class="info-val">2020-9-7 11:12</text>
+					<text class="info-val">{{detail.createDate}}</text>
 				</view>
 				<view class="info-main">
 					<text class="info-tit">完成时间:</text>
-					<text class="info-val">2020-9-7 16:20</text>
+					<text class="info-val">{{detail.endTime}}</text>
 				</view>
 				<view class="info-main">
 					<text class="info-tit">耗时:</text>
-					<text class="info-val">5小时8分</text>
+					<text class="info-val">{{detail.spendTime|formatTime}}</text>
 				</view>
 			</view>
 			<view class="inspection-items">
 				<u-grid :col="4" hover-class="none">
 					<u-grid-item>
-						<text class="grid-num text-blue">18</text>
+						<text class="grid-num text-blue">{{detail.totalTargetCount}}</text>
 						<text class="grid-text">检查项</text>
 					</u-grid-item>
 					<u-grid-item>
-						<text class="grid-num text-green">13</text>
+						<text class="grid-num text-green">{{detail.passTargetCount}}</text>
 						<text class="grid-text">合格</text>
 					</u-grid-item>
 					<u-grid-item>
-						<text class="grid-num text-red">3</text>
+						<text class="grid-num text-red">{{detail.notPassTargetCount}}</text>
 						<text class="grid-text">不合格</text>
 					</u-grid-item>
 					<u-grid-item>
-						<text class="grid-num text-yellow">2</text>
+						<text class="grid-num text-yellow">{{detail.notWorkTargetCount}}</text>
 						<text class="grid-text">不适用</text>
 					</u-grid-item>
 				</u-grid>
@@ -52,13 +52,33 @@
 </template>
 
 <script>
+	import moment from "moment"
+	import {getTaskDetail} from '@/api/task'
 	export default{
 		data(){
 			return{
-				
+				taskId: '',
+				detail: null
+			}
+		},
+		onLoad(opts) {
+			this.taskId = opts.taskId
+			this.getTaskDetail()
+		},
+		filters:{
+			formatTime(s){
+				return moment.duration(s*1000).hours() + '时' + moment.duration(s*1000).minutes() + '分';
 			}
 		},
 		methods: {
+			// 查询任务明细
+			getTaskDetail(){
+				getTaskDetail({id:this.taskId}).then(res => {
+					 if(res.status == 200){
+						 this.detail = res.data
+					 }
+				})
+			},
 			//  我的巡店记录
 			goMyShopTour(){
 				uni.navigateTo({
@@ -68,7 +88,7 @@
 			// 查看明细
 			goShopTourDetails(){
 				uni.navigateTo({
-					url: '/pages/shopTourDetails/shopTourDetails'
+					url: '/pages/shopTourDetails/shopTourDetails?taskId='+this.taskId
 				})
 			}
 		}

+ 2 - 2
pages/signIn/signIn.vue

@@ -90,8 +90,8 @@ export default {
 				lng: this.position.longitude
 			}).then(res => {
 				if (res.status == 200) {
-					//  跳转  开始巡店
-					uni.navigateTo({
+					//  跳转开始巡店
+					uni.redirectTo({
 						url: '/pages/shopTour/shopTour?storeId=' + this.stores.id + '&types=scene'
 					})
 				} else {

+ 4 - 2
pages/videoShopTour/videoShopTour.vue

@@ -55,15 +55,17 @@
 		methods: {
 			//  初始
 			init(){
-				//  获取门店列表
+				this.status = 'loading'
+				// 获取门店列表
 				findStoreList().then(res => {
 					if(res.status == 200){
 						this.list = res.data.list
-						this.total = res.data.count || 0
+						this.total = this.list.length
 					}else{
 						this.list = []
 						this.total = 0
 					}
+					this.status = 'loadmore'
 				})
 			},
 			//  按门店名称查询

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 180 - 158
unpackage/dist/dev/app-plus/app-view.js

@@ -9444,182 +9444,206 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return _c(
-    "v-uni-view",
-    { staticClass: _vm._$g(0, "sc"), attrs: { _i: 0 } },
-    [
-      _c(
+  return _vm._$g(0, "i")
+    ? _c(
         "v-uni-view",
-        { staticClass: _vm._$g(1, "sc"), attrs: { _i: 1 } },
+        { staticClass: _vm._$g(0, "sc"), attrs: { _i: 0 } },
         [
           _c(
             "v-uni-view",
-            { staticClass: _vm._$g(2, "sc"), attrs: { _i: 2 } },
+            { staticClass: _vm._$g(1, "sc"), attrs: { _i: 1 } },
             [
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(3, "sc"), attrs: { _i: 3 } },
+                { staticClass: _vm._$g(2, "sc"), attrs: { _i: 2 } },
                 [
                   _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(4, "sc"), attrs: { _i: 4 } },
-                    [_vm._v("门店:")]
-                  ),
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(5, "sc"), attrs: { _i: 5 } },
+                    "v-uni-view",
+                    { staticClass: _vm._$g(3, "sc"), attrs: { _i: 3 } },
                     [
-                      _vm._v(
-                        "常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店常青二路店"
+                      _c(
+                        "v-uni-text",
+                        { staticClass: _vm._$g(4, "sc"), attrs: { _i: 4 } },
+                        [_vm._v("门店:")]
+                      ),
+                      _c(
+                        "v-uni-text",
+                        { staticClass: _vm._$g(5, "sc"), attrs: { _i: 5 } },
+                        [_vm._v(_vm._$g(5, "t0-0"))]
                       )
-                    ]
-                  )
-                ],
-                1
-              ),
-              _c(
-                "v-uni-view",
-                { staticClass: _vm._$g(6, "sc"), attrs: { _i: 6 } },
-                [
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(7, "sc"), attrs: { _i: 7 } },
-                    [_vm._v("巡店人:")]
-                  ),
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(8, "sc"), attrs: { _i: 8 } },
-                    [_vm._v("常青二路店")]
-                  )
-                ],
-                1
-              ),
-              _c(
-                "v-uni-view",
-                { staticClass: _vm._$g(9, "sc"), attrs: { _i: 9 } },
-                [
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(10, "sc"), attrs: { _i: 10 } },
-                    [_vm._v("创建时间:")]
-                  ),
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(11, "sc"), attrs: { _i: 11 } },
-                    [_vm._v("2020-9-7 11:12")]
-                  )
-                ],
-                1
-              ),
-              _c(
-                "v-uni-view",
-                { staticClass: _vm._$g(12, "sc"), attrs: { _i: 12 } },
-                [
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } },
-                    [_vm._v("完成时间:")]
-                  ),
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
-                    [_vm._v("2020-9-7 16:20")]
-                  )
-                ],
-                1
-              ),
-              _c(
-                "v-uni-view",
-                { staticClass: _vm._$g(15, "sc"), attrs: { _i: 15 } },
-                [
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } },
-                    [_vm._v("耗时:")]
+                    ],
+                    1
                   ),
                   _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
-                    [_vm._v("5小时8分")]
-                  )
-                ],
-                1
-              )
-            ],
-            1
-          ),
-          _c(
-            "v-uni-view",
-            { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
-            [
-              _c(
-                "u-grid",
-                { attrs: { _i: 19 } },
-                [
-                  _c(
-                    "u-grid-item",
-                    { attrs: { _i: 20 } },
+                    "v-uni-view",
+                    { staticClass: _vm._$g(6, "sc"), attrs: { _i: 6 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
-                        [_vm._v("18")]
+                        { staticClass: _vm._$g(7, "sc"), attrs: { _i: 7 } },
+                        [_vm._v("巡店人:")]
                       ),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
-                        [_vm._v("检查项")]
+                        { staticClass: _vm._$g(8, "sc"), attrs: { _i: 8 } },
+                        [_vm._v(_vm._$g(8, "t0-0"))]
                       )
                     ],
                     1
                   ),
                   _c(
-                    "u-grid-item",
-                    { attrs: { _i: 23 } },
+                    "v-uni-view",
+                    { staticClass: _vm._$g(9, "sc"), attrs: { _i: 9 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(24, "sc"), attrs: { _i: 24 } },
-                        [_vm._v("13")]
+                        { staticClass: _vm._$g(10, "sc"), attrs: { _i: 10 } },
+                        [_vm._v("创建时间:")]
                       ),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(25, "sc"), attrs: { _i: 25 } },
-                        [_vm._v("合格")]
+                        { staticClass: _vm._$g(11, "sc"), attrs: { _i: 11 } },
+                        [_vm._v(_vm._$g(11, "t0-0"))]
                       )
                     ],
                     1
                   ),
                   _c(
-                    "u-grid-item",
-                    { attrs: { _i: 26 } },
+                    "v-uni-view",
+                    { staticClass: _vm._$g(12, "sc"), attrs: { _i: 12 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(27, "sc"), attrs: { _i: 27 } },
-                        [_vm._v("3")]
+                        { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } },
+                        [_vm._v("完成时间:")]
                       ),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
-                        [_vm._v("不合格")]
+                        { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
+                        [_vm._v(_vm._$g(14, "t0-0"))]
                       )
                     ],
                     1
                   ),
                   _c(
-                    "u-grid-item",
-                    { attrs: { _i: 29 } },
+                    "v-uni-view",
+                    { staticClass: _vm._$g(15, "sc"), attrs: { _i: 15 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
-                        [_vm._v("2")]
+                        { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } },
+                        [_vm._v("耗时:")]
                       ),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
-                        [_vm._v("不适用")]
+                        { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
+                        [_vm._v(_vm._$g(17, "t0-0"))]
+                      )
+                    ],
+                    1
+                  )
+                ],
+                1
+              ),
+              _c(
+                "v-uni-view",
+                { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
+                [
+                  _c(
+                    "u-grid",
+                    { attrs: { _i: 19 } },
+                    [
+                      _c(
+                        "u-grid-item",
+                        { attrs: { _i: 20 } },
+                        [
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(21, "sc"),
+                              attrs: { _i: 21 }
+                            },
+                            [_vm._v(_vm._$g(21, "t0-0"))]
+                          ),
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(22, "sc"),
+                              attrs: { _i: 22 }
+                            },
+                            [_vm._v("检查项")]
+                          )
+                        ],
+                        1
+                      ),
+                      _c(
+                        "u-grid-item",
+                        { attrs: { _i: 23 } },
+                        [
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(24, "sc"),
+                              attrs: { _i: 24 }
+                            },
+                            [_vm._v(_vm._$g(24, "t0-0"))]
+                          ),
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(25, "sc"),
+                              attrs: { _i: 25 }
+                            },
+                            [_vm._v("合格")]
+                          )
+                        ],
+                        1
+                      ),
+                      _c(
+                        "u-grid-item",
+                        { attrs: { _i: 26 } },
+                        [
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(27, "sc"),
+                              attrs: { _i: 27 }
+                            },
+                            [_vm._v(_vm._$g(27, "t0-0"))]
+                          ),
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(28, "sc"),
+                              attrs: { _i: 28 }
+                            },
+                            [_vm._v("不合格")]
+                          )
+                        ],
+                        1
+                      ),
+                      _c(
+                        "u-grid-item",
+                        { attrs: { _i: 29 } },
+                        [
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(30, "sc"),
+                              attrs: { _i: 30 }
+                            },
+                            [_vm._v(_vm._$g(30, "t0-0"))]
+                          ),
+                          _c(
+                            "v-uni-text",
+                            {
+                              staticClass: _vm._$g(31, "sc"),
+                              attrs: { _i: 31 }
+                            },
+                            [_vm._v("不适用")]
+                          )
+                        ],
+                        1
                       )
                     ],
                     1
@@ -9629,46 +9653,44 @@ var render = function() {
               )
             ],
             1
-          )
-        ],
-        1
-      ),
-      _c(
-        "v-uni-view",
-        { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
-        [
-          _c(
-            "u-button",
-            {
-              staticClass: _vm._$g(33, "sc"),
-              attrs: { _i: 33 },
-              on: {
-                click: function($event) {
-                  return _vm.$handleViewEvent($event)
-                }
-              }
-            },
-            [_vm._v("查看明细")]
           ),
           _c(
-            "u-button",
-            {
-              staticClass: _vm._$g(34, "sc"),
-              attrs: { _i: 34 },
-              on: {
-                click: function($event) {
-                  return _vm.$handleViewEvent($event)
-                }
-              }
-            },
-            [_vm._v("我的巡店记录")]
+            "v-uni-view",
+            { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
+            [
+              _c(
+                "u-button",
+                {
+                  staticClass: _vm._$g(33, "sc"),
+                  attrs: { _i: 33 },
+                  on: {
+                    click: function($event) {
+                      return _vm.$handleViewEvent($event)
+                    }
+                  }
+                },
+                [_vm._v("查看明细")]
+              ),
+              _c(
+                "u-button",
+                {
+                  staticClass: _vm._$g(34, "sc"),
+                  attrs: { _i: 34 },
+                  on: {
+                    click: function($event) {
+                      return _vm.$handleViewEvent($event)
+                    }
+                  }
+                },
+                [_vm._v("我的巡店记录")]
+              )
+            ],
+            1
           )
         ],
         1
       )
-    ],
-    1
-  )
+    : _vm._e()
 }
 var recyclableRender = false
 var staticRenderFns = []

+ 8 - 0
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -472,6 +472,14 @@
 		  saveZbPlImgsSuccess(){
 			  this.zbItem.splice(this.activeZbIndex,1,this.curZbItem)
 			  this.onClosePz()
+		  },
+		  // 提交此次任务
+		  submitTask(){
+			  this.sendMsg('submitTask','')
+		  },
+		  // 现场巡店下一步签字
+		  nextStep(){
+			  this.sendMsg('nextStep','')
 		  }
 		}
 	})

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff